build: switch to new protractor rule

WORKSPACE

@@ -249,7 +249,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "devinfra",
-    commit = "b45dfa77df2021b23eeda5928ca6cd8bb89b21e7",
+    commit = "cddc66a76ac0183790bc7a9fc1e5cf9f87512375",
     remote = "https://github.com/angular/dev-infra.git",
 )
 
@@ -302,7 +302,7 @@ esbuild_register_toolchains(
 
 git_repository(
     name = "rules_browsers",
-    commit = "7e23dc705680369a323f520909d3984ae794965e",
+    commit = "c8246bb6d8bba4e2ae23fc39c7b0cec651953e6d",
     remote = "https://github.com/devversion/rules_browsers.git",
 )
 

src/dev-app/BUILD.bazel

@@ -1,6 +1,6 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web")
-load("//tools:defaults.bzl", "http_server", "sass_binary")
-load("//tools:defaults2.bzl", "ng_project")
+load("//tools:defaults.bzl", "sass_binary")
+load("//tools:defaults2.bzl", "http_server", "ng_project")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
 load("//src/components-examples:config.bzl", "ALL_EXAMPLES")

src/e2e-app/BUILD.bazel

@@ -1,7 +1,7 @@
 load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
-load("//tools:defaults.bzl", "http_server", "sass_binary")
-load("//tools:defaults2.bzl", "ng_project")
+load("//tools:defaults.bzl", "sass_binary")
+load("//tools:defaults2.bzl", "http_server", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -18,7 +18,6 @@ devserverIndexHtmlDependencies = [
 
 exports_files([
     "protractor.conf.js",
-    "start-devserver.js",
     "devserver-configure.js",
 ])
 

src/e2e-app/test_suite.bzl

@@ -1,11 +1,8 @@
 load("//tools:defaults.bzl", "protractor_web_test_suite")
 
-def e2e_test_suite(name, data = [], tags = ["e2e"], deps = []):
+def e2e_test_suite(name, tags = ["e2e"], deps = []):
     protractor_web_test_suite(
         name = name,
-        configuration = "//src/e2e-app:protractor.conf.js",
-        data = data,
-        on_prepare = "//src/e2e-app:start-devserver.js",
         server = "//src/e2e-app:server",
         tags = tags,
         deps = deps,

src/universal-app/BUILD.bazel

@@ -1,7 +1,7 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_run_binary")
-load("//tools:defaults.bzl", "http_server", "protractor_web_test_suite", "sass_binary")
-load("//tools:defaults2.bzl", "ng_project", "ts_project")
+load("//tools:defaults.bzl", "protractor_web_test_suite", "sass_binary")
+load("//tools:defaults2.bzl", "http_server", "ng_project", "ts_project")
 load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
 load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
 load("//src/cdk:config.bzl", "CDK_TARGETS")
@@ -165,8 +165,6 @@ ts_project(
 
 protractor_web_test_suite(
     name = "hydration_e2e_tests",
-    configuration = ":protractor.conf.js",
-    on_prepare = ":start-devserver.js",
     server = ":server",
     tags = ["e2e"],
     deps = [

tools/defaults.bzl

@@ -6,15 +6,14 @@ load("@io_bazel_rules_sass//:defs.bzl", _npm_sass_library = "npm_sass_library",
 load("@npm//@angular/bazel:index.bzl", _ng_package = "ng_package")
 load("@npm//@angular/build-tooling/bazel/integration:index.bzl", _integration_test = "integration_test")
 load("@npm//@angular/build-tooling/bazel/esbuild:index.bzl", _esbuild = "esbuild", _esbuild_config = "esbuild_config")
-load("@npm//@angular/build-tooling/bazel/http-server:index.bzl", _http_server = "http_server")
 load("@npm//@angular/build-tooling/bazel:extract_js_module_output.bzl", "extract_js_module_output")
 load("//:packages.bzl", "NO_STAMP_NPM_PACKAGE_SUBSTITUTIONS", "NPM_PACKAGE_SUBSTITUTIONS")
 load("//:pkg-externals.bzl", "PKG_EXTERNALS")
 load("//tools/markdown-to-html:index.bzl", _markdown_to_html = "markdown_to_html")
 load("//tools/extract-tokens:index.bzl", _extract_tokens = "extract_tokens")
 load("//tools/bazel:ng_package_interop.bzl", "ng_package_interop")
 load("//tools:defaults2.bzl", "spec_bundle", _karma_web_test_suite = "karma_web_test_suite")
-load("@npm//@bazel/protractor:index.bzl", _protractor_web_test_suite = "protractor_web_test_suite")
+load("@rules_browsers//src/protractor_test:index.bzl", "protractor_test")
 
 npmPackageSubstitutions = select({
     "//tools:stamp": NPM_PACKAGE_SUBSTITUTIONS,
@@ -27,7 +26,6 @@ integration_test = _integration_test
 extract_tokens = _extract_tokens
 esbuild = _esbuild
 esbuild_config = _esbuild_config
-http_server = _http_server
 karma_web_test_suite = _karma_web_test_suite
 
 def sass_binary(sourcemap = False, include_paths = [], **kwargs):
@@ -148,10 +146,24 @@ def protractor_web_test_suite(name, deps, **kwargs):
         external = ["protractor", "selenium-webdriver"],
     )
 
-    _protractor_web_test_suite(
+    protractor_test(
         name = name,
-        browsers = ["@npm//@angular/build-tooling/bazel/browsers/chromium:chromium"],
-        deps = ["%s_bundle" % name],
+        deps = [":%s_bundle" % name],
+        extra_config = {
+            "useAllAngular2AppRoots": True,
+            "allScriptsTimeout": 120000,
+            "getPageTimeout": 120000,
+            "jasmineNodeOpts": {
+                "defaultTimeoutInterval": 120000,
+            },
+            # Since we want to use async/await we don't want to mix up with selenium's promise
+            # manager. In order to enforce this, we disable the promise manager.
+            "SELENIUM_PROMISE_MANAGER": False,
+        },
+        data = [
+            "//:node_modules/protractor",
+            "//:node_modules/selenium-webdriver",
+        ],
         **kwargs
     )
 

tools/defaults2.bzl

@@ -5,8 +5,10 @@ load("@aspect_rules_js//npm:defs.bzl", _npm_package = "npm_package")
 load("@rules_angular//src/ng_project:index.bzl", _ng_project = "ng_project")
 load("@devinfra//bazel/spec-bundling:index_rjs.bzl", _spec_bundle = "spec_bundle")
 load("@rules_browsers//src/wtr:index.bzl", "wtr_test")
+load("@devinfra//bazel/http-server:index.bzl", _http_server = "http_server")
 
 spec_bundle = _spec_bundle
+http_server = _http_server
 
 def npm_package(**kwargs):
     _npm_package(**kwargs)