Skip to content
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

Integrate with a CSS parser for selector parsing #1086

Merged
merged 25 commits into from
Sep 16, 2017
Merged

Integrate with a CSS parser for selector parsing #1086

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8177e26
Implement new selector parsing module
Aug 21, 2017
0d4a7eb
Use new selector API in mount and shallow wrappers
Aug 21, 2017
51ff0e7
Implement findParentNode utility
Aug 21, 2017
26bf200
Rename selector tests file
Aug 21, 2017
fa80c0e
Stop treating unquoted strings as invalid
Aug 21, 2017
b18cfe4
Update tests
Aug 21, 2017
5dde9c6
Add more comments to selectors.js
Aug 21, 2017
f20b0c4
Linting fixes
Aug 21, 2017
d7abfbe
Remove ComplexSelector
Aug 21, 2017
8bffb8a
Remove old predicate/selector parsing utilities
Aug 21, 2017
10019da
Remove invalid attribute test
Aug 21, 2017
5efaf08
Throw an error for complex selectors in buildPredicate
Aug 21, 2017
83c6f04
Move combinator logic into discrete utility functions
Aug 21, 2017
8b3e008
Replace scalpel with new rst-selector-parser package
Aug 22, 2017
1a73724
Throw for pseudo-class and psuedo-element selectors
Aug 23, 2017
36e10d2
Add more tests for selectors
Aug 23, 2017
ae733ee
Add test for URLS in attribute values
Aug 25, 2017
60b6a86
Improve test coverage, use correct APIs
Sep 1, 2017
2c3227b
Remove uuid from enzyme package.json
Sep 1, 2017
d0d810e
Fix error type in selector assertion
Sep 1, 2017
459108a
Fix react prop test assertion
Sep 1, 2017
188ed1c
Use if/else for branching in selector predicate functions
Sep 1, 2017
17f366d
Add nodeHasProperty test for NaN and Infinity
Sep 13, 2017
aadbc4a
Add test for adjacent siblings in arrays
Sep 13, 2017
a79e150
Use _reactInternalFiber for 16 adapater
Sep 13, 2017
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
Prev Previous commit
Next Next commit
Use new selector API in mount and shallow wrappers
  • Loading branch information
Brandon Dail committed Sep 13, 2017
commit 0d4a7eb149e4bb5ece627781c4dc99d9dc8fa94e
12 changes: 4 additions & 8 deletions packages/enzyme/src/ReactWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import flatten from 'lodash/flatten';
import unique from 'lodash/uniq';
import compact from 'lodash/compact';

import ComplexSelector from './ComplexSelector';
import createWrapperComponent from './ReactWrapperComponent';
import {
containsChildrenSubArray,
typeOfNode,
Expand All @@ -25,9 +25,10 @@ import {
childrenOfNode,
parentsOfNode,
treeFilter,
buildPredicate,
} from './RSTTraversal';

import { buildPredicate, reduceTreeBySelector } from './selectors';

const noop = () => {};

const NODE = sym('__node__');
Expand Down Expand Up @@ -101,11 +102,6 @@ class ReactWrapper {
this.length = this[NODES].length;
}
privateSet(this, OPTIONS, root ? root[OPTIONS] : options);
privateSet(this, COMPLEX_SELECTOR, new ComplexSelector(
buildPredicate,
findWhereUnwrapped,
childrenOfNode,
));
}

/**
Expand Down Expand Up @@ -464,7 +460,7 @@ class ReactWrapper {
* @returns {ReactWrapper}
*/
find(selector) {
return this[COMPLEX_SELECTOR].find(selector, this);
return reduceTreeBySelector(selector, this);
}

/**
Expand Down
10 changes: 2 additions & 8 deletions packages/enzyme/src/ShallowWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import unique from 'lodash/uniq';
import compact from 'lodash/compact';
import cheerio from 'cheerio';

import ComplexSelector from './ComplexSelector';
import {
nodeEqual,
nodeMatches,
Expand All @@ -29,8 +28,8 @@ import {
childrenOfNode,
parentsOfNode,
treeFilter,
buildPredicate,
} from './RSTTraversal';
import { buildPredicate, reduceTreeBySelector } from './selectors';

const NODE = sym('__node__');
const NODES = sym('__nodes__');
Expand Down Expand Up @@ -145,11 +144,6 @@ class ShallowWrapper {
this.length = this[NODES].length;
}
privateSet(this, OPTIONS, root ? root[OPTIONS] : options);
privateSet(this, COMPLEX_SELECTOR, new ComplexSelector(
buildPredicate,
findWhereUnwrapped,
childrenOfNode,
));
}

getNodeInternal() {
Expand Down Expand Up @@ -541,7 +535,7 @@ class ShallowWrapper {
* @returns {ShallowWrapper}
*/
find(selector) {
return this[COMPLEX_SELECTOR].find(selector, this);
return reduceTreeBySelector(selector, this);
}

/**
Expand Down