Merge pull request #26 from DesignByOnyx/25-fix-shadow-find

fix(shadowFind): fix issues with retry-ability and $.find semantics
abramenal · Dec 25, 2019 · 0a619e1 · 0a619e1
2 parents 9a3bb80 + 5311a8d
commit 0a619e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/src/commands/shadowFind/command.js b/src/commands/shadowFind/command.js
@@ -9,10 +9,18 @@ export default function shadowFind(subject, selector, options = {}) {
  validateOptions(options, DEFAULT_COMMAND_OPTIONS);
 
  const elGetter = () => {
- const currentElement = subject[0].shadowRoot || subject[0];
- const found = currentElement.querySelectorAll(selector);
+ const found = Cypress.$(selector, subject);
 
- return found;
+ if (found.length) {
+ return found;
+ }
+
+ return Array.from(subject).reduce((result, sub) => {
+ if (sub.shadowRoot) {
+ return result.add(selector, sub.shadowRoot);
+ }
+ return result;
+ }, Cypress.$([]));
  };
 
  return resolveValue(elGetter, options).then(foundElements => {

diff --git a/src/validators/validateSelector.js b/src/validators/validateSelector.js
@@ -4,20 +4,4 @@ export default selector => {
  if (!selector || typeof selector !== 'string') {
  throw new InternalError(ERR_TYPES.INVALID_SELECTOR);
  }
-
- /*
- * Matches any spaces not inside ""
- * e.g. `input[placeholder="First A Name"]` will not be matched
- * however `div input[placeholder="Text"]` will find the whitespace
- */
- const illegalSpaceBeforeRegex = /(?<!".+)(\s)/g;
- const illegalSpaceAfterRegex = /(\s)(?!.+")/g;
-
- if (!!selector.match(illegalSpaceBeforeRegex) || !!selector.match(illegalSpaceAfterRegex)) {
- throw new InternalError(ERR_TYPES.INVALID_SELECTOR_NO_MULTI);
- }
-
- if (selector.indexOf('@') !== -1) {
- throw new InternalError(ERR_TYPES.INVALID_SELECTOR_NO_ALIAS);
- }
 };