Skip to content

Check for existence of Element when comparing DOM-nody-things (#7786) (clean cherry pick version) #7995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 1, 2019
Merged

Check for existence of Element when comparing DOM-nody-things (#7786) (clean cherry pick version) #7995

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c22ec2d
Check for existence of `Element` when comparing DOM-nody-things (#7786)
mfeineis Feb 3, 2019
50da3fc
Fall back to deep equality for presumed DOM nodes if `Element` is not…
mfeineis Feb 4, 2019
f47ae58
Remove IE<9 specific fallback DOM node comparison (#7786)
mfeineis Feb 4, 2019
8f3265b
Check for global DOM `Node` in `isDomNode` (#7786)
mfeineis Feb 5, 2019
aabb662
Check that `isEqualNode` is a function and remove duck typing from `i…
mfeineis Feb 6, 2019
44309ee
Add changelog entry for streamlined DOM node comparisons in `expect` …
mfeineis Mar 1, 2019
0fe182c
Merge branch 'master' into expect-dom-nodeenv-bug-7786-clean
mfeineis Mar 1, 2019
79e152d
Correct visible PR number in CHANGELOG.md
pedrottimark Mar 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1996,6 +1996,28 @@ Expected: <green>{\\"a\\": 99}</>
Received: <red>{\\"a\\": 99}</>"
`;

exports[`.toEqual() {pass: false} expect({"nodeName": "div", "nodeType": 1}).not.toEqual({"nodeName": "div", "nodeType": 1}) 1`] = `
"<dim>expect(</><red>received</><dim>).</>not<dim>.toEqual(</><green>expected</><dim>)</>

Expected: <green>{\\"nodeName\\": \\"div\\", \\"nodeType\\": 1}</>
Received: <red>{\\"nodeName\\": \\"div\\", \\"nodeType\\": 1}</>"
`;

exports[`.toEqual() {pass: false} expect({"nodeName": "div", "nodeType": 1}).toEqual({"nodeName": "p", "nodeType": 1}) 1`] = `
"<dim>expect(</><red>received</><dim>).toEqual(</><green>expected</><dim>)</>

Difference:

<green>- Expected</>
<red>+ Received</>

<dim> Object {</>
<green>- \\"nodeName\\": \\"p\\",</>
<red>+ \\"nodeName\\": \\"div\\",</>
<dim> \\"nodeType\\": 1,</>
<dim> }</>"
`;

exports[`.toEqual() {pass: false} expect({"target": {"nodeType": 1, "value": "a"}}).toEqual({"target": {"nodeType": 1, "value": "b"}}) 1`] = `
"<dim>expect(</><red>received</><dim>).toEqual(</><green>expected</><dim>)</>

Expand Down
20 changes: 20 additions & 0 deletions packages/expect/src/__tests__/matchers.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,16 @@ describe('.toEqual()', () => {
},
},
],
[
{
nodeName: 'div',
nodeType: 1,
},
{
nodeName: 'p',
nodeType: 1,
},
],
].forEach(([a, b]) => {
test(`{pass: false} expect(${stringify(a)}).toEqual(${stringify(
b,
Expand Down Expand Up @@ -537,6 +547,16 @@ describe('.toEqual()', () => {
},
},
],
[
{
nodeName: 'div',
nodeType: 1,
},
{
nodeName: 'div',
nodeType: 1,
},
],
].forEach(([a, b]) => {
test(`{pass: false} expect(${stringify(a)}).not.toEqual(${stringify(
b,
Expand Down
30 changes: 6 additions & 24 deletions packages/expect/src/jasmineUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,24 +129,9 @@ function eq(

var aIsDomNode = isDomNode(a);
var bIsDomNode = isDomNode(b);
if (aIsDomNode && bIsDomNode) {
// At first try to use DOM3 method isEqualNode
if (a.isEqualNode) {
return a.isEqualNode(b);
}
// IE8 doesn't support isEqualNode, try to use outerHTML && innerText
var aIsElement = a instanceof Element;
var bIsElement = b instanceof Element;
if (aIsElement && bIsElement) {
return a.outerHTML == b.outerHTML;
}
if (aIsElement || bIsElement) {
return false;
}
return a.innerText == b.innerText && a.textContent == b.textContent;
}
if (aIsDomNode || bIsDomNode) {
return false;
// Use DOM3 method isEqualNode (IE>=9)
if (aIsDomNode && typeof a.isEqualNode === 'function' && bIsDomNode) {
return a.isEqualNode(b);
}

// Assume equality for cyclic structures. The algorithm for detecting cyclic
Expand Down Expand Up @@ -260,12 +245,9 @@ export function isA(typeName: string, value: unknown) {
}

function isDomNode(obj: any): obj is Node {
return (
obj !== null &&
typeof obj === 'object' &&
typeof obj.nodeType === 'number' &&
typeof obj.nodeName === 'string'
);
// In some test environments (e.g. "node") there is no `Node` even though
// we might be comparing things that look like DOM nodes.
return typeof Node !== 'undefined' && obj instanceof Node;
}

export function fnNameFor(func: Function) {
Expand Down