Switch to protractor_web_test_suite for e2e tests

Author: gregmagolan

.circleci/config.yml

@@ -70,10 +70,6 @@ jobs:
 
       # Run the benchmark
       - run: node_modules/.bin/ibazel-benchmark-runner //src:devserver src/hello-world/hello-world.component.ts --url=http://localhost:5432
-
-      # Run the protractor end-to-end test - it's not a Bazel target because
-      # we didn't write a protractor rule yet.
-      - run: xvfb-run -a yarn e2e
 
       - store_artifacts:
           path: dist/bin/src/bundle.min.js

BUILD.bazel

@@ -43,5 +43,7 @@ filegroup(
         "*.js",
         "*.json",
         "*.d.ts",
-    ]]),
+    ]] + [
+        "node_modules/protractor/**",
+    ]),
 )

README.md

@@ -89,13 +89,6 @@ bundlers can be integrated with Bazel.
 $ ibazel run src:prodserver
 ```
 
-We also use Protractor to run end-to-end tests. We don't have a protractor rule
-yet, so we'll take the build results from Bazel and run the test outside of Bazel.
-
-```bash
-$ yarn e2e
-```
-
 ## Coming soon
 
 - Protractor bazel rule

package.json

@@ -26,12 +26,8 @@
         "typescript": "2.9.1"
     },
     "scripts": {
-        "postinstall": "concurrently \"webdriver-manager update $CHROMEDRIVER_VERSION_ARG\" \"ngc -p postinstall.tsconfig.json\"",
+        "postinstall": "ngc -p postinstall.tsconfig.json",
         "serve": "ibazel run //src:devserver",
-        "pree2e": "bazel build test/...",
-        "e2e": "yarn e2e-prodserver && yarn e2e-devserver",
-        "e2e-prodserver": "concurrently \"bazel run //src:prodserver\" \"while ! nc -z 127.0.0.1 5432; do sleep 1; done && protractor\" --kill-others --success first",
-        "e2e-devserver": "concurrently \"bazel run //src:devserver\" \"while ! nc -z 127.0.0.1 5432; do sleep 1; done && protractor\" --kill-others --success first",
         "prebuildifier": "bazel build @com_github_bazelbuild_buildtools//buildifier",
         "buildifier": "note: working around https://github.com/alexeagle/angular-bazel-example/issues/60",
         "buildifier": "find . -type f \\( -name BUILD -or -name BUILD.bazel \\) ! -path \"./node_modules/*\" | xargs $(bazel info bazel-bin)/external/com_github_bazelbuild_buildtools/buildifier/*/buildifier",

protractor.conf.js

@@ -1,7 +1,24 @@
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@angular//:index.bzl", "protractor_web_test_suite")
 
 ts_library(
     name = "e2e",
     testonly = 1,
     srcs = glob(["*.ts"]),
 )
+
+protractor_web_test_suite(
+    name = "prodserver_test",
+    data = ["@angular//packages/bazel/src/protractor/utils"],
+    on_prepare = ":protractor.on-prepare.js",
+    server = "//src:prodserver",
+    deps = [":e2e"],
+)
+
+protractor_web_test_suite(
+    name = "devserver_test",
+    data = ["@angular//packages/bazel/src/protractor/utils"],
+    on_prepare = ":protractor.on-prepare.js",
+    server = "//src:devserver",
+    deps = [":e2e"],
+)

test/e2e/BUILD.bazel

@@ -0,0 +1,11 @@
+const protractorUtils = require('@angular/bazel/protractor-utils');
+const protractor = require('protractor');
+
+module.exports = function(config) {
+  const portFlag = config.server.endsWith('prodserver') ? '-p' : '-port';
+  return protractorUtils.runServer(config.workspace, config.server, portFlag, [])
+      .then(serverSpec => {
+        const serverUrl = `http://localhost:${serverSpec.port}`;
+        protractor.browser.baseUrl = serverUrl;
+      });
+};

test/e2e/protractor.on-prepare.js

@@ -3,12 +3,11 @@ See https://www.npmjs.com/package/history-server
 """
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 
-def history_server(port = 5432, args = [], **kwargs):
-  if not args:
-    args = [native.package_name()]
-  args.extend(["-p", str(port)])
+def history_server(templated_args = [], **kwargs):
+  if not templated_args:
+    templated_args = [native.package_name()]
   nodejs_binary(
       node_modules = "@history-server_runtime_deps//:node_modules",
       entry_point = "history-server/modules/cli.js",
-      args = args,
+      templated_args = templated_args,
       **kwargs)