From e040db728cb8178bde71692244412233d5a5a468 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Thu, 11 Jul 2019 10:40:42 +0200 Subject: [PATCH] build: fine grain runfile dependencies for e2e tests Currently the e2e tests always include the `@angular/bazel` package in the runfiles. This is causing a signifcant performance issue as the bazel package brings in a lot of other packages resulting in a lot of files that need to be symlinked by bazel. Additionally duplication is avoided by having a macro for creating the test suite target. This allows us to easily make such changes in the future without having to go through all Bazel e2e targets. --- src/cdk-experimental/scrolling/BUILD.bazel | 13 +++---------- src/cdk-experimental/testing/BUILD.bazel | 13 +++---------- src/cdk/overlay/BUILD.bazel | 12 ++---------- src/e2e-app/start-devserver.js | 2 +- src/e2e-app/test_suite.bzl | 15 +++++++++++++++ src/material-experimental/mdc-button/BUILD.bazel | 13 +++---------- src/material-experimental/mdc-card/BUILD.bazel | 13 +++---------- .../mdc-checkbox/BUILD.bazel | 13 +++---------- src/material-experimental/mdc-chips/BUILD.bazel | 13 +++---------- src/material-experimental/mdc-menu/BUILD.bazel | 13 +++---------- src/material-experimental/mdc-radio/BUILD.bazel | 13 +++---------- .../mdc-slide-toggle/BUILD.bazel | 13 +++---------- src/material-experimental/mdc-tabs/BUILD.bazel | 13 +++---------- src/material/button-toggle/BUILD.bazel | 12 ++---------- src/material/button/BUILD.bazel | 12 ++---------- src/material/card/BUILD.bazel | 13 +++---------- src/material/checkbox/BUILD.bazel | 12 ++---------- src/material/dialog/BUILD.bazel | 12 ++---------- src/material/expansion/BUILD.bazel | 12 ++---------- src/material/grid-list/BUILD.bazel | 12 ++---------- src/material/icon/BUILD.bazel | 12 ++---------- src/material/input/BUILD.bazel | 12 ++---------- src/material/list/BUILD.bazel | 12 ++---------- src/material/menu/BUILD.bazel | 12 ++---------- src/material/progress-bar/BUILD.bazel | 12 ++---------- src/material/progress-spinner/BUILD.bazel | 12 ++---------- src/material/radio/BUILD.bazel | 12 ++---------- src/material/sidenav/BUILD.bazel | 12 ++---------- src/material/slide-toggle/BUILD.bazel | 12 ++---------- src/material/stepper/BUILD.bazel | 12 ++---------- src/material/tabs/BUILD.bazel | 12 ++---------- src/material/toolbar/BUILD.bazel | 12 ++---------- 32 files changed, 87 insertions(+), 301 deletions(-) create mode 100644 src/e2e-app/test_suite.bzl diff --git a/src/cdk-experimental/scrolling/BUILD.bazel b/src/cdk-experimental/scrolling/BUILD.bazel index 750444dc0d7..8680540155b 100644 --- a/src/cdk-experimental/scrolling/BUILD.bazel +++ b/src/cdk-experimental/scrolling/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "scrolling", @@ -43,16 +44,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/cdk-experimental/testing/BUILD.bazel b/src/cdk-experimental/testing/BUILD.bazel index f3ae529f99a..63078de0661 100644 --- a/src/cdk-experimental/testing/BUILD.bazel +++ b/src/cdk-experimental/testing/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ng_module", "ng_web_test_suite", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_module", "ng_web_test_suite") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "testing", @@ -18,16 +19,8 @@ ng_web_test_suite( deps = ["//src/cdk-experimental/testing/tests:unit_test_sources"], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ "//src/cdk-experimental/testing/tests:e2e_test_sources", "@npm//protractor", diff --git a/src/cdk/overlay/BUILD.bazel b/src/cdk/overlay/BUILD.bazel index 513fc2a3231..e3e3c9c5775 100644 --- a/src/cdk/overlay/BUILD.bazel +++ b/src/cdk/overlay/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -76,16 +76,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/e2e-app/start-devserver.js b/src/e2e-app/start-devserver.js index cee1c15f9ca..74d6c53e7b7 100644 --- a/src/e2e-app/start-devserver.js +++ b/src/e2e-app/start-devserver.js @@ -1,5 +1,5 @@ const protractor = require('protractor'); -const utils = require('@angular/bazel/protractor-utils'); +const utils = require('@angular/bazel/src/protractor/utils'); const spawn = require('child_process').spawn; /** diff --git a/src/e2e-app/test_suite.bzl b/src/e2e-app/test_suite.bzl new file mode 100644 index 00000000000..be1384c4463 --- /dev/null +++ b/src/e2e-app/test_suite.bzl @@ -0,0 +1,15 @@ +load("//tools:defaults.bzl", "protractor_web_test_suite") + +def e2e_test_suite(name, data = [], tags = ["e2e"], deps = []): + protractor_web_test_suite( + name = name, + configuration = "//src/e2e-app:protractor.conf.js", + data = [ + "//tools/axe-protractor", + "@npm//:node_modules/@angular/bazel/src/protractor/utils/index.js", + ] + data, + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + tags = tags, + deps = deps, + ) diff --git a/src/material-experimental/mdc-button/BUILD.bazel b/src/material-experimental/mdc-button/BUILD.bazel index 783d81f2910..d5b10df1d48 100644 --- a/src/material-experimental/mdc-button/BUILD.bazel +++ b/src/material-experimental/mdc-button/BUILD.bazel @@ -1,7 +1,8 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") -load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "mdc-button", @@ -80,16 +81,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material-experimental/mdc-card/BUILD.bazel b/src/material-experimental/mdc-card/BUILD.bazel index f344b391137..dac47da8b4b 100644 --- a/src/material-experimental/mdc-card/BUILD.bazel +++ b/src/material-experimental/mdc-card/BUILD.bazel @@ -1,7 +1,8 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") -load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "mdc-card", @@ -39,16 +40,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material-experimental/mdc-checkbox/BUILD.bazel b/src/material-experimental/mdc-checkbox/BUILD.bazel index 208f137a5d5..c10f378509d 100644 --- a/src/material-experimental/mdc-checkbox/BUILD.bazel +++ b/src/material-experimental/mdc-checkbox/BUILD.bazel @@ -1,7 +1,8 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") -load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite", "protractor_web_test_suite", "ts_library") +load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "mdc-checkbox", @@ -97,16 +98,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material-experimental/mdc-chips/BUILD.bazel b/src/material-experimental/mdc-chips/BUILD.bazel index 816feb9f42d..82bda637f08 100644 --- a/src/material-experimental/mdc-chips/BUILD.bazel +++ b/src/material-experimental/mdc-chips/BUILD.bazel @@ -1,7 +1,8 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") -load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "mdc-chips", @@ -52,16 +53,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material-experimental/mdc-menu/BUILD.bazel b/src/material-experimental/mdc-menu/BUILD.bazel index d6f1da62385..54fead1e4f2 100644 --- a/src/material-experimental/mdc-menu/BUILD.bazel +++ b/src/material-experimental/mdc-menu/BUILD.bazel @@ -1,7 +1,8 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") -load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "mdc-menu", @@ -79,16 +80,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material-experimental/mdc-radio/BUILD.bazel b/src/material-experimental/mdc-radio/BUILD.bazel index de20a992edc..b6e77765c04 100644 --- a/src/material-experimental/mdc-radio/BUILD.bazel +++ b/src/material-experimental/mdc-radio/BUILD.bazel @@ -1,7 +1,8 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") -load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "mdc-radio", @@ -39,16 +40,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material-experimental/mdc-slide-toggle/BUILD.bazel b/src/material-experimental/mdc-slide-toggle/BUILD.bazel index 37eab3af475..7d3294b1cb1 100644 --- a/src/material-experimental/mdc-slide-toggle/BUILD.bazel +++ b/src/material-experimental/mdc-slide-toggle/BUILD.bazel @@ -1,7 +1,8 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") -load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "mdc-slide-toggle", @@ -76,16 +77,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material-experimental/mdc-tabs/BUILD.bazel b/src/material-experimental/mdc-tabs/BUILD.bazel index be013849d4c..25d45fd347b 100644 --- a/src/material-experimental/mdc-tabs/BUILD.bazel +++ b/src/material-experimental/mdc-tabs/BUILD.bazel @@ -1,7 +1,8 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") -load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "mdc-tabs", @@ -49,16 +50,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/button-toggle/BUILD.bazel b/src/material/button-toggle/BUILD.bazel index 007bbf7b19f..fd607fb35a3 100644 --- a/src/material/button-toggle/BUILD.bazel +++ b/src/material/button-toggle/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -71,16 +71,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/button/BUILD.bazel b/src/material/button/BUILD.bazel index 39d41cd9d3d..56260d8849a 100644 --- a/src/material/button/BUILD.bazel +++ b/src/material/button/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -71,16 +71,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/card/BUILD.bazel b/src/material/card/BUILD.bazel index 3f501d05020..e5b21956091 100644 --- a/src/material/card/BUILD.bazel +++ b/src/material/card/BUILD.bazel @@ -1,7 +1,8 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") -load("//tools:defaults.bzl", "markdown_to_html", "ng_e2e_test_library", "ng_module", "protractor_web_test_suite") +load("//tools:defaults.bzl", "markdown_to_html", "ng_e2e_test_library", "ng_module") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") ng_module( name = "card", @@ -40,16 +41,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/checkbox/BUILD.bazel b/src/material/checkbox/BUILD.bazel index e8340ee89ad..665088cf5bc 100644 --- a/src/material/checkbox/BUILD.bazel +++ b/src/material/checkbox/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -78,16 +78,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/dialog/BUILD.bazel b/src/material/dialog/BUILD.bazel index fdaa73ac6ae..ab5b7c9df5d 100644 --- a/src/material/dialog/BUILD.bazel +++ b/src/material/dialog/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -80,16 +80,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/expansion/BUILD.bazel b/src/material/expansion/BUILD.bazel index ef2999a4dfc..b455ea7e4d6 100644 --- a/src/material/expansion/BUILD.bazel +++ b/src/material/expansion/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -85,16 +85,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/grid-list/BUILD.bazel b/src/material/grid-list/BUILD.bazel index aa68e7e2937..8e033add563 100644 --- a/src/material/grid-list/BUILD.bazel +++ b/src/material/grid-list/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -65,16 +65,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/icon/BUILD.bazel b/src/material/icon/BUILD.bazel index 019f81503bf..543a8b037e7 100644 --- a/src/material/icon/BUILD.bazel +++ b/src/material/icon/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -68,16 +68,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/input/BUILD.bazel b/src/material/input/BUILD.bazel index 63c77468426..5cdce09d9dd 100644 --- a/src/material/input/BUILD.bazel +++ b/src/material/input/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -72,16 +72,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/list/BUILD.bazel b/src/material/list/BUILD.bazel index e53a6efd9e0..d87027e4150 100644 --- a/src/material/list/BUILD.bazel +++ b/src/material/list/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -78,16 +78,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/menu/BUILD.bazel b/src/material/menu/BUILD.bazel index 18fb2e73c1d..5125348eef3 100644 --- a/src/material/menu/BUILD.bazel +++ b/src/material/menu/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -83,16 +83,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/progress-bar/BUILD.bazel b/src/material/progress-bar/BUILD.bazel index 995fffbca5b..cbc2560c094 100644 --- a/src/material/progress-bar/BUILD.bazel +++ b/src/material/progress-bar/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -70,16 +70,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/progress-spinner/BUILD.bazel b/src/material/progress-spinner/BUILD.bazel index e5cba1665ec..d0d54ec86f3 100644 --- a/src/material/progress-spinner/BUILD.bazel +++ b/src/material/progress-spinner/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -68,16 +68,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/radio/BUILD.bazel b/src/material/radio/BUILD.bazel index 39d0d0f0ca1..49956092e45 100644 --- a/src/material/radio/BUILD.bazel +++ b/src/material/radio/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -74,16 +74,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/sidenav/BUILD.bazel b/src/material/sidenav/BUILD.bazel index 67127efb302..2c0fea09154 100644 --- a/src/material/sidenav/BUILD.bazel +++ b/src/material/sidenav/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -81,16 +81,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/slide-toggle/BUILD.bazel b/src/material/slide-toggle/BUILD.bazel index 370eba14eab..2ba7d502de5 100644 --- a/src/material/slide-toggle/BUILD.bazel +++ b/src/material/slide-toggle/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -77,16 +77,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/stepper/BUILD.bazel b/src/material/stepper/BUILD.bazel index 524b7da1b31..1e8ab563d7f 100644 --- a/src/material/stepper/BUILD.bazel +++ b/src/material/stepper/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -90,16 +90,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/tabs/BUILD.bazel b/src/material/tabs/BUILD.bazel index 3c22021df36..23d1718b62d 100644 --- a/src/material/tabs/BUILD.bazel +++ b/src/material/tabs/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -117,16 +117,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e", diff --git a/src/material/toolbar/BUILD.bazel b/src/material/toolbar/BUILD.bazel index 4290f924c88..c8c675dd9fc 100644 --- a/src/material/toolbar/BUILD.bazel +++ b/src/material/toolbar/BUILD.bazel @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "markdown_to_html", @@ -8,7 +9,6 @@ load( "ng_module", "ng_test_library", "ng_web_test_suite", - "protractor_web_test_suite", ) ng_module( @@ -67,16 +67,8 @@ ng_e2e_test_library( ], ) -protractor_web_test_suite( +e2e_test_suite( name = "e2e_tests", - configuration = "//src/e2e-app:protractor.conf.js", - data = [ - "//tools/axe-protractor", - "@npm//@angular/bazel", - ], - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - tags = ["e2e"], deps = [ ":e2e_test_sources", "//src/cdk/testing/e2e",