make protractor tests work

Author: mmalerba

package.json

@@ -112,7 +112,7 @@
     "husky": "^1.3.1",
     "inquirer": "^6.2.0",
     "jasmine-core": "^3.3.0",
-    "kagekiri": "^1.0.16",
+    "kagekiri": "^1.0.18",
     "karma": "^4.4.1",
     "karma-browserstack-launcher": "^1.3.0",
     "karma-chrome-launcher": "^2.2.0",
@@ -128,7 +128,6 @@
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
     "moment": "^2.18.1",
-    "sass": "^1.24.4",
     "parse5": "^5.0.0",
     "protractor": "^5.4.2",
     "requirejs": "^2.3.6",
@@ -138,6 +137,7 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
     "run-sequence": "^1.2.2",
+    "sass": "^1.24.4",
     "scss-bundle": "^3.0.2",
     "selenium-webdriver": "^3.6.0",
     "semver": "^6.3.0",

src/cdk/testing/kagekiri.d.ts

@@ -7,5 +7,5 @@
  */
 
 declare module 'kagekiri' {
-  export function querySelectorAll(selector: string, root: Element);
+  export function querySelectorAll(selector: string, root: Element): NodeListOf<Element>;
 }

src/cdk/testing/protractor/protractor-harness-environment.ts

@@ -47,11 +47,11 @@ export class ProtractorHarnessEnvironment extends HarnessEnvironment<ElementFind
   }
 
   protected async getAllRawElements(selector: string): Promise<ElementFinder[]> {
-    const elementFinderArray = this._queryFn(selector, this.rawRootElement);
-    const length = await elementFinderArray.count();
+    const elementArrayFinder = this._queryFn(selector, this.rawRootElement);
+    const length = await elementArrayFinder.count();
     const elements: ElementFinder[] = [];
     for (let i = 0; i < length; i++) {
-      elements.push(elementFinderArray.get(i));
+      elements.push(elementArrayFinder.get(i));
     }
     return elements;
   }

src/cdk/testing/tests/BUILD.bazel

@@ -54,6 +54,5 @@ ng_e2e_test_library(
         "//src/cdk/testing",
         "//src/cdk/testing/private",
         "//src/cdk/testing/protractor",
-        "@npm//kagekiri",
     ],
 )

src/cdk/testing/tests/protractor.e2e.spec.ts

@@ -6,15 +6,17 @@ import {
 } from '@angular/cdk/testing';
 import {expectAsyncError} from '@angular/cdk/testing/private';
 import {ProtractorHarnessEnvironment} from '@angular/cdk/testing/protractor';
-import {browser, by, ElementFinder} from 'protractor';
+import {browser, by, element as protractorElement, ElementFinder} from 'protractor';
 import {MainComponentHarness} from './harnesses/main-component-harness';
 import {SubComponentHarness, SubComponentSpecialHarness} from './harnesses/sub-component-harness';
-import {querySelectorAll as piercingQuerySelectorAll} from 'kagekiri';
 
-const piercingQueryFn =
-    (selector: string, root: ElementFinder) => root.all(by.js(function(this: any) {
-      piercingQuerySelectorAll(selector, this);
-    }));
+// TODO: is there some better way to do this?
+declare const kagekiri: {
+  querySelectorAll: (selector: string, root: Element) => NodeListOf<Element>;
+};
+
+const piercingQueryFn = (selector: string, root: ElementFinder) => protractorElement.all(by.js(
+    (s: string, r: Element) => kagekiri.querySelectorAll(s, r), selector, root.getWebElement()));
 
 describe('ProtractorHarnessEnvironment', () => {
   beforeEach(async () => {
@@ -465,7 +467,7 @@ describe('ProtractorHarnessEnvironment', () => {
 
     describe('shadow DOM interaction', () => {
       it('should not pierce shadow boundary by default', async () => {
-        const harness = await ProtractorHarnessEnvironment.loader(piercingQueryFn)
+        const harness = await ProtractorHarnessEnvironment.loader()
             .getHarness(MainComponentHarness);
         expect(await harness.shadows()).toEqual([]);
       });

src/e2e-app/BUILD.bazel

@@ -110,6 +110,7 @@ ts_devserver(
     static_files = [
         "@npm//zone.js",
         "@npm//core-js",
+        "@npm//kagekiri",
         "@npm//material-components-web",
         "@npm//moment",
         "@npm//@webcomponents/custom-elements",

src/e2e-app/index.html

@@ -29,6 +29,7 @@
   <!-- Static scripts which are not imported through AMD nor part of the ConcatJS bundle. -->
   <script src="core-js/client/core.min.js"></script>
   <script src="zone.js/dist/zone.min.js"></script>
+  <script src="kagekiri/dist/kagekiri.umd.min.js"></script>
 
   <!-- ConcatJS bundle from the Bazel TypeScript devserver. -->
   <script src="bundle.js"></script>

yarn.lock

@@ -3520,11 +3520,6 @@ cssesc@^0.1.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
   integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
 csv-streamify@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/csv-streamify/-/csv-streamify-3.0.4.tgz#4cb614c57e3f299cca17b63fdcb4ad167777f47a"
@@ -6730,12 +6725,10 @@ jws@^3.0.0, jws@^3.1.4, jws@^3.1.5:
     jwa "^1.1.5"
     safe-buffer "^5.0.1"
 
-kagekiri@^1.0.16:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/kagekiri/-/kagekiri-1.0.16.tgz#b4e0aeb8d57fe2e8d8f84f0d099fe35d21c529ed"
-  integrity sha512-/F1UiJ1CpRIOqJq8o0z9r6By2Rv2B+rC37fFbcYnKTWJ4JDXmDaEMer8NAm3afWwgRrJgkrQldXy3BL1wToMlg==
-  dependencies:
-    postcss-selector-parser nolanlawson/postcss-selector-parser#util-deprecate
+kagekiri@^1.0.18:
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/kagekiri/-/kagekiri-1.0.18.tgz#4400714f37d79e7ec80c99aa5a0a59f729c1a6a7"
+  integrity sha512-J0dcWXcdzMDBOm3YE5sljkPfAHenv9zELJhjlfo/mxe98CtaaIXbC9JIjOfLk8m4B9hiATmkm5vBaBPrOOSbAQ==
 
 karma-browserstack-launcher@^1.3.0:
   version "1.3.0"
@@ -8976,15 +8969,6 @@ postcss-selector-parser@^3.1.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@nolanlawson/postcss-selector-parser#util-deprecate:
-  version "6.0.2"
-  resolved "https://codeload.github.com/nolanlawson/postcss-selector-parser/tar.gz/75e38f7a7db8d58fb033ab7d24414b55d81e5b4f"
-  dependencies:
-    cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-    util-deprecate "^1.0.2"
-
 postcss-syntax@^0.36.2:
   version "0.36.2"
   resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
@@ -11738,7 +11722,7 @@ useragent@2.3.0:
     lru-cache "4.1.x"
     tmp "0.0.x"
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=