From dd75bdfcd594254989fcce96578db9717160f0cb Mon Sep 17 00:00:00 2001 From: Miles Malerba Date: Fri, 24 May 2019 14:38:26 -0700 Subject: [PATCH 1/7] chore: move e2e tests into component source dirs --- e2e/BUILD.bazel | 1 - src/cdk-experimental/dialog/BUILD.bazel | 6 +++--- src/cdk-experimental/popover-edit/BUILD.bazel | 6 +++--- src/cdk-experimental/scrolling/BUILD.bazel | 6 +++--- src/cdk/a11y/BUILD.bazel | 6 +++--- src/cdk/accordion/BUILD.bazel | 6 +++--- src/cdk/bidi/BUILD.bazel | 6 +++--- src/cdk/coercion/BUILD.bazel | 6 +++--- src/cdk/collections/BUILD.bazel | 6 +++--- src/cdk/drag-drop/BUILD.bazel | 6 +++--- src/cdk/keycodes/BUILD.bazel | 6 +++--- src/cdk/layout/BUILD.bazel | 6 +++--- src/cdk/observers/BUILD.bazel | 6 +++--- src/cdk/overlay/BUILD.bazel | 6 +++--- src/cdk/portal/BUILD.bazel | 6 +++--- src/cdk/schematics/BUILD.bazel | 6 +++--- src/cdk/scrolling/BUILD.bazel | 6 +++--- src/cdk/table/BUILD.bazel | 6 +++--- src/cdk/text-field/BUILD.bazel | 6 +++--- src/cdk/tree/BUILD.bazel | 6 +++--- src/material-experimental/mdc-checkbox/BUILD.bazel | 2 +- src/material-experimental/mdc-menu/BUILD.bazel | 2 +- src/material-experimental/mdc-slide-toggle/BUILD.bazel | 2 +- src/material-experimental/popover-edit/BUILD.bazel | 6 +++--- src/material-moment-adapter/BUILD.bazel | 6 +++--- src/material/autocomplete/BUILD.bazel | 6 +++--- src/material/badge/BUILD.bazel | 6 +++--- src/material/bottom-sheet/BUILD.bazel | 6 +++--- src/material/button-toggle/BUILD.bazel | 6 +++--- src/material/button/BUILD.bazel | 6 +++--- src/material/checkbox/BUILD.bazel | 6 +++--- src/material/chips/BUILD.bazel | 6 +++--- src/material/core/BUILD.bazel | 6 +++--- src/material/datepicker/BUILD.bazel | 6 +++--- src/material/dialog/BUILD.bazel | 6 +++--- src/material/divider/BUILD.bazel | 6 +++--- src/material/expansion/BUILD.bazel | 6 +++--- src/material/grid-list/BUILD.bazel | 6 +++--- src/material/icon/BUILD.bazel | 6 +++--- src/material/input/BUILD.bazel | 6 +++--- src/material/list/BUILD.bazel | 6 +++--- src/material/menu/BUILD.bazel | 6 +++--- src/material/paginator/BUILD.bazel | 6 +++--- src/material/progress-bar/BUILD.bazel | 6 +++--- src/material/progress-spinner/BUILD.bazel | 6 +++--- src/material/radio/BUILD.bazel | 6 +++--- src/material/schematics/BUILD.bazel | 6 +++--- src/material/select/BUILD.bazel | 6 +++--- src/material/sidenav/BUILD.bazel | 6 +++--- src/material/slide-toggle/BUILD.bazel | 6 +++--- src/material/slider/BUILD.bazel | 6 +++--- src/material/snack-bar/BUILD.bazel | 6 +++--- src/material/sort/BUILD.bazel | 6 +++--- src/material/stepper/BUILD.bazel | 6 +++--- src/material/table/BUILD.bazel | 6 +++--- src/material/tabs/BUILD.bazel | 6 +++--- src/material/toolbar/BUILD.bazel | 6 +++--- src/material/tooltip/BUILD.bazel | 6 +++--- src/material/tree/BUILD.bazel | 6 +++--- 59 files changed, 168 insertions(+), 169 deletions(-) diff --git a/e2e/BUILD.bazel b/e2e/BUILD.bazel index 6c84fbc8f917..402821ce181a 100644 --- a/e2e/BUILD.bazel +++ b/e2e/BUILD.bazel @@ -44,4 +44,3 @@ ts_library( "//tools/axe-protractor", ], ) for spec_file in glob(["components/**/*.spec.ts"])] - diff --git a/src/cdk-experimental/dialog/BUILD.bazel b/src/cdk-experimental/dialog/BUILD.bazel index d48f18dbf450..240e4bbead88 100644 --- a/src/cdk-experimental/dialog/BUILD.bazel +++ b/src/cdk-experimental/dialog/BUILD.bazel @@ -27,8 +27,8 @@ sass_binary( ) ng_test_library( - name = "dialog_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/common", "@npm//@angular/platform-browser", @@ -42,6 +42,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":dialog_test_sources"] + deps = [":unit_test_sources"] ) diff --git a/src/cdk-experimental/popover-edit/BUILD.bazel b/src/cdk-experimental/popover-edit/BUILD.bazel index 65f64f363459..ac4d35860764 100644 --- a/src/cdk-experimental/popover-edit/BUILD.bazel +++ b/src/cdk-experimental/popover-edit/BUILD.bazel @@ -21,8 +21,8 @@ ng_module( ) ng_test_library( - name = "popover_edit_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ ":popover-edit", "@npm//@angular/common", @@ -39,5 +39,5 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":popover_edit_test_sources"], + deps = [":unit_test_sources"], ) diff --git a/src/cdk-experimental/scrolling/BUILD.bazel b/src/cdk-experimental/scrolling/BUILD.bazel index 883da1ed1369..821691d1c145 100644 --- a/src/cdk-experimental/scrolling/BUILD.bazel +++ b/src/cdk-experimental/scrolling/BUILD.bazel @@ -16,8 +16,8 @@ ng_module( ) ng_test_library( - name = "scrolling_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "//src/cdk/scrolling", ":scrolling", @@ -26,5 +26,5 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":scrolling_test_sources"] + deps = [":unit_test_sources"] ) diff --git a/src/cdk/a11y/BUILD.bazel b/src/cdk/a11y/BUILD.bazel index 4e7416ec750c..05db3cd515db 100644 --- a/src/cdk/a11y/BUILD.bazel +++ b/src/cdk/a11y/BUILD.bazel @@ -31,8 +31,8 @@ sass_binary( ) ng_test_library( - name = "a11y_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "@npm//rxjs", @@ -46,7 +46,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":a11y_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/accordion/BUILD.bazel b/src/cdk/accordion/BUILD.bazel index 01e87fe13860..a321f84c2912 100644 --- a/src/cdk/accordion/BUILD.bazel +++ b/src/cdk/accordion/BUILD.bazel @@ -16,8 +16,8 @@ ng_module( ) ng_test_library( - name = "accordion_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", ":accordion", @@ -26,7 +26,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":accordion_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/bidi/BUILD.bazel b/src/cdk/bidi/BUILD.bazel index 724dfaf5be61..c960b84f7a4b 100644 --- a/src/cdk/bidi/BUILD.bazel +++ b/src/cdk/bidi/BUILD.bazel @@ -14,8 +14,8 @@ ng_module( ) ng_test_library( - name = "bidi_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", ":bidi" @@ -24,7 +24,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":bidi_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/coercion/BUILD.bazel b/src/cdk/coercion/BUILD.bazel index 72fe7d7ea3ac..2e5307f5b0fb 100644 --- a/src/cdk/coercion/BUILD.bazel +++ b/src/cdk/coercion/BUILD.bazel @@ -12,8 +12,8 @@ ts_library( ) ts_library( - name = "coercion_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/core", "@npm//@types/jasmine", @@ -24,7 +24,7 @@ ts_library( ts_web_test_suite( name = "unit_tests", - deps = [":coercion_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/collections/BUILD.bazel b/src/cdk/collections/BUILD.bazel index 0c8a04060707..64f53e026c31 100644 --- a/src/cdk/collections/BUILD.bazel +++ b/src/cdk/collections/BUILD.bazel @@ -14,8 +14,8 @@ ng_module( ) ng_test_library( - name = "collections_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ ":collections" ], @@ -23,7 +23,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":collections_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/drag-drop/BUILD.bazel b/src/cdk/drag-drop/BUILD.bazel index 1c61422d9b27..ac195d9c4af4 100644 --- a/src/cdk/drag-drop/BUILD.bazel +++ b/src/cdk/drag-drop/BUILD.bazel @@ -19,8 +19,8 @@ ng_module( ) ng_test_library( - name = "drag-drop_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "drag-unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//rxjs", "@npm//@angular/common", @@ -32,7 +32,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":drag-drop_test_sources"], + deps = [":drag-unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/keycodes/BUILD.bazel b/src/cdk/keycodes/BUILD.bazel index 97197cb44ba6..cd63ee5aa521 100644 --- a/src/cdk/keycodes/BUILD.bazel +++ b/src/cdk/keycodes/BUILD.bazel @@ -9,8 +9,8 @@ ts_library( ) ts_library( - name = "keycodes_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@types/jasmine", "//src/cdk/testing", @@ -21,7 +21,7 @@ ts_library( ts_web_test_suite( name = "unit_tests", - deps = [":keycodes_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/layout/BUILD.bazel b/src/cdk/layout/BUILD.bazel index f3eb9a2b4235..ddeebe24efc6 100644 --- a/src/cdk/layout/BUILD.bazel +++ b/src/cdk/layout/BUILD.bazel @@ -16,8 +16,8 @@ ng_module( ) ng_test_library( - name = "layout_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//rxjs", "//src/cdk/platform", @@ -27,7 +27,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":layout_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/observers/BUILD.bazel b/src/cdk/observers/BUILD.bazel index 71c2b88a6a0c..0664c28e804c 100644 --- a/src/cdk/observers/BUILD.bazel +++ b/src/cdk/observers/BUILD.bazel @@ -15,14 +15,14 @@ ng_module( ) ng_test_library( - name = "observers_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [":observers"], ) ng_web_test_suite( name = "unit_tests", - deps = [":observers_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/overlay/BUILD.bazel b/src/cdk/overlay/BUILD.bazel index 860c1a84faff..3a622aae8704 100644 --- a/src/cdk/overlay/BUILD.bazel +++ b/src/cdk/overlay/BUILD.bazel @@ -33,8 +33,8 @@ sass_binary( ) ng_test_library( - name = "overlay_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/common", "@npm//@angular/platform-browser", @@ -51,7 +51,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":overlay_test_sources"], + deps = [":unit_test_sources"], static_css = ["overlay_prebuilt_scss"], ) diff --git a/src/cdk/portal/BUILD.bazel b/src/cdk/portal/BUILD.bazel index 0921898eab71..573d5250d2c1 100644 --- a/src/cdk/portal/BUILD.bazel +++ b/src/cdk/portal/BUILD.bazel @@ -13,8 +13,8 @@ ng_module( ) ng_test_library( - name = "portal_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/common", ":portal", @@ -23,7 +23,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":portal_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/schematics/BUILD.bazel b/src/cdk/schematics/BUILD.bazel index 9412908e98ed..38f217f0f524 100644 --- a/src/cdk/schematics/BUILD.bazel +++ b/src/cdk/schematics/BUILD.bazel @@ -46,13 +46,13 @@ npm_package( jasmine_node_test( name = "unit_tests", - srcs = [":schematics_test_sources"], + srcs = [":unit_test_sources"], data = [":schematics_assets", ":schematics_test_cases"], ) ts_library( - name = "schematics_test_sources", - srcs = glob(["**/*.spec.ts"], exclude = ["**/files/**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts", "**/files/**/*.spec.ts"]), deps = [ "//src/cdk/schematics/testing", "@npm//@schematics/angular", diff --git a/src/cdk/scrolling/BUILD.bazel b/src/cdk/scrolling/BUILD.bazel index 6b4593307e58..df96749f136b 100644 --- a/src/cdk/scrolling/BUILD.bazel +++ b/src/cdk/scrolling/BUILD.bazel @@ -26,8 +26,8 @@ sass_binary( ) ng_test_library( - name = "scrolling_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//rxjs", "//src/cdk/bidi", @@ -39,7 +39,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":scrolling_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/table/BUILD.bazel b/src/cdk/table/BUILD.bazel index 8b33522ae722..00fd609e7e02 100644 --- a/src/cdk/table/BUILD.bazel +++ b/src/cdk/table/BUILD.bazel @@ -19,8 +19,8 @@ ng_module( ) ng_test_library( - name = "table_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//rxjs", "//src/cdk/bidi", @@ -31,7 +31,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":table_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/text-field/BUILD.bazel b/src/cdk/text-field/BUILD.bazel index af747befd027..f088ecb43364 100644 --- a/src/cdk/text-field/BUILD.bazel +++ b/src/cdk/text-field/BUILD.bazel @@ -28,8 +28,8 @@ sass_binary( ) ng_test_library( - name = "text-field_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "text-unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -42,7 +42,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":text-field_test_sources"], + deps = [":text-unit_test_sources"], static_css = [":text_field_prebuilt_scss"] ) diff --git a/src/cdk/tree/BUILD.bazel b/src/cdk/tree/BUILD.bazel index 6614a41bde43..7cc8729310b4 100644 --- a/src/cdk/tree/BUILD.bazel +++ b/src/cdk/tree/BUILD.bazel @@ -19,8 +19,8 @@ ng_module( ) ng_test_library( - name = "tree_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//rxjs", "//src/cdk/collections", @@ -31,7 +31,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":tree_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material-experimental/mdc-checkbox/BUILD.bazel b/src/material-experimental/mdc-checkbox/BUILD.bazel index fc27a5534f10..28711cdb8af8 100644 --- a/src/material-experimental/mdc-checkbox/BUILD.bazel +++ b/src/material-experimental/mdc-checkbox/BUILD.bazel @@ -46,7 +46,7 @@ sass_binary( ng_test_library( name = "checkbox_tests_lib", - srcs = glob(["**/*.spec.ts"]), + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ ":mdc-checkbox", "@npm//@angular/platform-browser", diff --git a/src/material-experimental/mdc-menu/BUILD.bazel b/src/material-experimental/mdc-menu/BUILD.bazel index 549026711669..9a935c2c96ba 100644 --- a/src/material-experimental/mdc-menu/BUILD.bazel +++ b/src/material-experimental/mdc-menu/BUILD.bazel @@ -43,7 +43,7 @@ sass_binary( ng_test_library( name = "menu_tests_lib", - srcs = glob(["**/*.spec.ts"]), + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ ":mdc-menu", "@npm//@angular/platform-browser", diff --git a/src/material-experimental/mdc-slide-toggle/BUILD.bazel b/src/material-experimental/mdc-slide-toggle/BUILD.bazel index a6a92e1ac44e..f15c7bfd1d78 100644 --- a/src/material-experimental/mdc-slide-toggle/BUILD.bazel +++ b/src/material-experimental/mdc-slide-toggle/BUILD.bazel @@ -43,7 +43,7 @@ sass_binary( ng_test_library( name = "slide_toggle_tests_lib", - srcs = glob(["**/*.spec.ts"]), + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ ":mdc-slide-toggle", "@npm//@angular/platform-browser", diff --git a/src/material-experimental/popover-edit/BUILD.bazel b/src/material-experimental/popover-edit/BUILD.bazel index c8684ad37b0a..329d5b0aeb09 100644 --- a/src/material-experimental/popover-edit/BUILD.bazel +++ b/src/material-experimental/popover-edit/BUILD.bazel @@ -23,8 +23,8 @@ sass_library( ) ng_test_library( - name = "popover_edit_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ ":popover-edit", "@npm//@angular/common", @@ -41,5 +41,5 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":popover_edit_test_sources"] + deps = [":unit_test_sources"] ) diff --git a/src/material-moment-adapter/BUILD.bazel b/src/material-moment-adapter/BUILD.bazel index f35cdcd39565..94cb3d8f792d 100644 --- a/src/material-moment-adapter/BUILD.bazel +++ b/src/material-moment-adapter/BUILD.bazel @@ -19,8 +19,8 @@ ng_module( ) ng_test_library( - name = "moment_adapter_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "//src/material/core", "//src/material/testing", @@ -33,7 +33,7 @@ ng_web_test_suite( name = "unit_tests", deps = [ ":require-config.js", - ":moment_adapter_test_sources" + ":unit_test_sources" ], # We need to load Moment statically since it is not a named AMD module and needs to # be manually configured through "require.js" which is used by "ts_web_test_suite". diff --git a/src/material/autocomplete/BUILD.bazel b/src/material/autocomplete/BUILD.bazel index e4a9900eee8e..04234e4ae552 100644 --- a/src/material/autocomplete/BUILD.bazel +++ b/src/material/autocomplete/BUILD.bazel @@ -42,8 +42,8 @@ sass_binary( ) ng_test_library( - name = "autocomplete_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -62,7 +62,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":autocomplete_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/badge/BUILD.bazel b/src/material/badge/BUILD.bazel index 7041a27531fd..54a4bfa8c3d3 100644 --- a/src/material/badge/BUILD.bazel +++ b/src/material/badge/BUILD.bazel @@ -29,8 +29,8 @@ sass_library( ) ng_test_library( - name = "badge_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "//src/material/core", @@ -40,7 +40,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":badge_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/bottom-sheet/BUILD.bazel b/src/material/bottom-sheet/BUILD.bazel index b0cc0109280d..397043d1f111 100644 --- a/src/material/bottom-sheet/BUILD.bazel +++ b/src/material/bottom-sheet/BUILD.bazel @@ -39,8 +39,8 @@ sass_binary( ) ng_test_library( - name = "bottom_sheet_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/common", "@npm//@angular/platform-browser", @@ -55,7 +55,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":bottom_sheet_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/button-toggle/BUILD.bazel b/src/material/button-toggle/BUILD.bazel index 905347273d49..14f9552f1e10 100644 --- a/src/material/button-toggle/BUILD.bazel +++ b/src/material/button-toggle/BUILD.bazel @@ -35,8 +35,8 @@ sass_binary( ) ng_test_library( - name = "button_toggle_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -47,7 +47,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":button_toggle_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/button/BUILD.bazel b/src/material/button/BUILD.bazel index d770fc2385cf..5a78aada36a0 100644 --- a/src/material/button/BUILD.bazel +++ b/src/material/button/BUILD.bazel @@ -36,8 +36,8 @@ sass_binary( ) ng_test_library( - name = "button_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "//src/material/core", @@ -47,7 +47,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":button_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/checkbox/BUILD.bazel b/src/material/checkbox/BUILD.bazel index 5fe6e4698e65..a90f46994403 100644 --- a/src/material/checkbox/BUILD.bazel +++ b/src/material/checkbox/BUILD.bazel @@ -41,8 +41,8 @@ sass_binary( ) ng_test_library( - name = "checkbox_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -54,7 +54,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":checkbox_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/chips/BUILD.bazel b/src/material/chips/BUILD.bazel index 0e48ea3f0fca..f3d7c7600400 100644 --- a/src/material/chips/BUILD.bazel +++ b/src/material/chips/BUILD.bazel @@ -40,8 +40,8 @@ sass_binary( ) ng_test_library( - name = "chips_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/animations", "@npm//@angular/forms", @@ -61,7 +61,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":chips_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/core/BUILD.bazel b/src/material/core/BUILD.bazel index b58173cfdc45..4203b9a4f6bb 100644 --- a/src/material/core/BUILD.bazel +++ b/src/material/core/BUILD.bazel @@ -98,8 +98,8 @@ sass_binary( ################# ng_test_library( - name = "core_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "//src/cdk/keycodes", @@ -112,7 +112,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":core_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/datepicker/BUILD.bazel b/src/material/datepicker/BUILD.bazel index 7f687ea99ff4..bb99635165ed 100644 --- a/src/material/datepicker/BUILD.bazel +++ b/src/material/datepicker/BUILD.bazel @@ -63,8 +63,8 @@ sass_binary( ) ng_test_library( - name = "datepicker_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -85,7 +85,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":datepicker_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/dialog/BUILD.bazel b/src/material/dialog/BUILD.bazel index 755a882e38fe..486f2a2459cb 100644 --- a/src/material/dialog/BUILD.bazel +++ b/src/material/dialog/BUILD.bazel @@ -39,8 +39,8 @@ sass_binary( ) ng_test_library( - name = "dialog_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/common", "@npm//@angular/platform-browser", @@ -56,7 +56,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":dialog_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/divider/BUILD.bazel b/src/material/divider/BUILD.bazel index e8f5273cccc7..5ecc6f744c17 100644 --- a/src/material/divider/BUILD.bazel +++ b/src/material/divider/BUILD.bazel @@ -29,8 +29,8 @@ sass_binary( ) ng_test_library( - name = "divider_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", ":divider", @@ -39,7 +39,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":divider_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/expansion/BUILD.bazel b/src/material/expansion/BUILD.bazel index d4c7e2814242..4431065288ae 100644 --- a/src/material/expansion/BUILD.bazel +++ b/src/material/expansion/BUILD.bazel @@ -48,8 +48,8 @@ sass_binary( ) ng_test_library( - name = "expansion_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "//src/cdk/a11y", @@ -61,7 +61,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":expansion_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/grid-list/BUILD.bazel b/src/material/grid-list/BUILD.bazel index 32a3e7aad7fa..7162292990f4 100644 --- a/src/material/grid-list/BUILD.bazel +++ b/src/material/grid-list/BUILD.bazel @@ -30,8 +30,8 @@ sass_binary( ) ng_test_library( - name = "grid_list_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "//src/cdk/bidi", @@ -41,7 +41,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":grid_list_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/icon/BUILD.bazel b/src/material/icon/BUILD.bazel index 7f8b0644172d..e5207f4c4444 100644 --- a/src/material/icon/BUILD.bazel +++ b/src/material/icon/BUILD.bazel @@ -32,8 +32,8 @@ sass_binary( ) ng_test_library( - name = "icon_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/common", "@npm//@angular/platform-browser", @@ -44,7 +44,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":icon_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/input/BUILD.bazel b/src/material/input/BUILD.bazel index b18f6823564b..4eb2a58f4138 100644 --- a/src/material/input/BUILD.bazel +++ b/src/material/input/BUILD.bazel @@ -29,8 +29,8 @@ sass_library( ) ng_test_library( - name = "input_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -48,7 +48,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":input_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/list/BUILD.bazel b/src/material/list/BUILD.bazel index 25a50ae0e9d6..3f71dba472a4 100644 --- a/src/material/list/BUILD.bazel +++ b/src/material/list/BUILD.bazel @@ -40,8 +40,8 @@ sass_binary( ) ng_test_library( - name = "list_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -54,7 +54,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":list_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/menu/BUILD.bazel b/src/material/menu/BUILD.bazel index 38fd8ef0be4f..4a6e105531bd 100644 --- a/src/material/menu/BUILD.bazel +++ b/src/material/menu/BUILD.bazel @@ -41,8 +41,8 @@ sass_binary( ) ng_test_library( - name = "menu_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "@npm//rxjs", @@ -59,7 +59,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":menu_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/paginator/BUILD.bazel b/src/material/paginator/BUILD.bazel index eea10a2a3d59..5dfb486cb6a6 100644 --- a/src/material/paginator/BUILD.bazel +++ b/src/material/paginator/BUILD.bazel @@ -34,8 +34,8 @@ sass_binary( ) ng_test_library( - name = "paginator_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "//src/cdk/testing", @@ -47,7 +47,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":paginator_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/progress-bar/BUILD.bazel b/src/material/progress-bar/BUILD.bazel index 6fd94825b103..ec32cd28dd75 100644 --- a/src/material/progress-bar/BUILD.bazel +++ b/src/material/progress-bar/BUILD.bazel @@ -35,8 +35,8 @@ sass_binary( ) ng_test_library( - name = "progress_bar_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "//src/cdk/testing", @@ -46,7 +46,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":progress_bar_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/progress-spinner/BUILD.bazel b/src/material/progress-spinner/BUILD.bazel index 70efbec58365..67be895707a8 100644 --- a/src/material/progress-spinner/BUILD.bazel +++ b/src/material/progress-spinner/BUILD.bazel @@ -33,8 +33,8 @@ sass_binary( ) ng_test_library( - name = "progress_spinner_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", ":progress-spinner", @@ -43,7 +43,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":progress_spinner_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/radio/BUILD.bazel b/src/material/radio/BUILD.bazel index 5b9c6b96bbcd..d475adfc1305 100644 --- a/src/material/radio/BUILD.bazel +++ b/src/material/radio/BUILD.bazel @@ -38,8 +38,8 @@ sass_binary( ) ng_test_library( - name = "radio_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -50,7 +50,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":radio_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/schematics/BUILD.bazel b/src/material/schematics/BUILD.bazel index 3f53ed483676..284f3dfc05d7 100644 --- a/src/material/schematics/BUILD.bazel +++ b/src/material/schematics/BUILD.bazel @@ -43,13 +43,13 @@ npm_package( jasmine_node_test( name = "unit_tests", - srcs = [":schematics_test_sources"], + srcs = [":unit_test_sources"], data = [":schematics_assets", ":schematics_test_cases"], ) ts_library( - name = "schematics_test_sources", - srcs = glob(["**/*.spec.ts"], exclude=["ng-generate/*/files/**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts", "ng-generate/*/files/**/*.spec.ts"]), deps = [ ":schematics", "//src/cdk/schematics", diff --git a/src/material/select/BUILD.bazel b/src/material/select/BUILD.bazel index 02d3e0155a77..ece7f491d002 100644 --- a/src/material/select/BUILD.bazel +++ b/src/material/select/BUILD.bazel @@ -43,8 +43,8 @@ sass_binary( ) ng_test_library( - name = "select_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -64,7 +64,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":select_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/sidenav/BUILD.bazel b/src/material/sidenav/BUILD.bazel index 8c99c66572fd..6f39c32dc87e 100644 --- a/src/material/sidenav/BUILD.bazel +++ b/src/material/sidenav/BUILD.bazel @@ -41,8 +41,8 @@ sass_binary( ) ng_test_library( - name = "sidenav_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "//src/cdk/a11y", @@ -57,7 +57,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":sidenav_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/slide-toggle/BUILD.bazel b/src/material/slide-toggle/BUILD.bazel index 99c258ab978f..90eb014eec2e 100644 --- a/src/material/slide-toggle/BUILD.bazel +++ b/src/material/slide-toggle/BUILD.bazel @@ -38,8 +38,8 @@ sass_binary( ) ng_test_library( - name = "slide_toggle_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -53,7 +53,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":slide_toggle_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/slider/BUILD.bazel b/src/material/slider/BUILD.bazel index e0facc5081cd..92a893b0acd3 100644 --- a/src/material/slider/BUILD.bazel +++ b/src/material/slider/BUILD.bazel @@ -40,8 +40,8 @@ sass_binary( ) ng_test_library( - name = "slider_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -55,7 +55,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":slider_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/snack-bar/BUILD.bazel b/src/material/snack-bar/BUILD.bazel index 5085b427e37f..8380dfbbfe5c 100644 --- a/src/material/snack-bar/BUILD.bazel +++ b/src/material/snack-bar/BUILD.bazel @@ -46,8 +46,8 @@ sass_binary( ) ng_test_library( - name = "snack_bar_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/common", "@npm//@angular/platform-browser", @@ -59,7 +59,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":snack_bar_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/sort/BUILD.bazel b/src/material/sort/BUILD.bazel index fedd93d2663f..a454896a68e7 100644 --- a/src/material/sort/BUILD.bazel +++ b/src/material/sort/BUILD.bazel @@ -31,8 +31,8 @@ sass_binary( ) ng_test_library( - name = "sort_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "@npm//rxjs", @@ -46,7 +46,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":sort_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/stepper/BUILD.bazel b/src/material/stepper/BUILD.bazel index 5c32bc46a82f..10eace36c19f 100644 --- a/src/material/stepper/BUILD.bazel +++ b/src/material/stepper/BUILD.bazel @@ -47,8 +47,8 @@ sass_binary( ) ng_test_library( - name = "stepper_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", "@npm//@angular/platform-browser", @@ -66,7 +66,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":stepper_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/table/BUILD.bazel b/src/material/table/BUILD.bazel index f61035e97d96..aa739a89e9d3 100644 --- a/src/material/table/BUILD.bazel +++ b/src/material/table/BUILD.bazel @@ -33,8 +33,8 @@ sass_binary( ) ng_test_library( - name = "table_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", "@npm//rxjs", @@ -47,7 +47,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":table_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/tabs/BUILD.bazel b/src/material/tabs/BUILD.bazel index 6b03a7f1264a..a29013ca8423 100644 --- a/src/material/tabs/BUILD.bazel +++ b/src/material/tabs/BUILD.bazel @@ -74,8 +74,8 @@ sass_binary( ) ng_test_library( - name = "tabs_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/common", "@npm//@angular/platform-browser", @@ -93,7 +93,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":tabs_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/toolbar/BUILD.bazel b/src/material/toolbar/BUILD.bazel index 4112941f941b..9aec9464aeae 100644 --- a/src/material/toolbar/BUILD.bazel +++ b/src/material/toolbar/BUILD.bazel @@ -33,8 +33,8 @@ sass_binary( ) ng_test_library( - name = "toolbar_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/platform-browser", ":toolbar", @@ -43,7 +43,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":toolbar_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/tooltip/BUILD.bazel b/src/material/tooltip/BUILD.bazel index b3e6cdc29875..c38b5d5b2b49 100644 --- a/src/material/tooltip/BUILD.bazel +++ b/src/material/tooltip/BUILD.bazel @@ -44,8 +44,8 @@ sass_binary( ) ng_test_library( - name = "tooltip_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/animations", "@npm//@angular/platform-browser", @@ -61,7 +61,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":tooltip_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/material/tree/BUILD.bazel b/src/material/tree/BUILD.bazel index ac5af87a434c..04066f9c9474 100644 --- a/src/material/tree/BUILD.bazel +++ b/src/material/tree/BUILD.bazel @@ -31,8 +31,8 @@ sass_binary( ) ng_test_library( - name = "tree_test_sources", - srcs = glob(["**/*.spec.ts"]), + name = "unit_test_sources", + srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//rxjs", "//src/cdk/tree", @@ -42,7 +42,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":tree_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( From 0db06b37058c21b1f4c6f6023c0d57ef900c7943 Mon Sep 17 00:00:00 2001 From: Miles Malerba Date: Fri, 24 May 2019 15:00:16 -0700 Subject: [PATCH 2/7] move utils in e2e/ to src/e2e-app/ --- e2e/BUILD.bazel | 20 +++++-------------- .../block-scroll-strategy-e2e.spec.ts | 2 +- e2e/components/dialog-e2e.spec.ts | 2 +- e2e/components/grid-list-e2e.spec.ts | 2 +- e2e/components/list-e2e.spec.ts | 2 +- e2e/components/mdc-menu-e2e.spec.ts | 2 +- e2e/components/mdc-slide-toggle-e2e.spec.ts | 2 +- e2e/components/menu-e2e.spec.ts | 2 +- e2e/components/progress-bar-e2e.spec.ts | 2 +- e2e/components/slide-toggle-e2e.spec.ts | 2 +- e2e/components/stepper-e2e.spec.ts | 4 ++-- e2e/components/tabs-e2e.spec.ts | 2 +- e2e/index-e2e.spec.ts | 12 ----------- src/e2e-app/BUILD.bazel | 16 +++++++++++++-- {e2e => src/e2e-app}/protractor.conf.js | 0 {e2e => src/e2e-app}/start-devserver.js | 0 .../util => src/e2e-app/test-util}/actions.ts | 0 .../util => src/e2e-app/test-util}/asserts.ts | 0 {e2e/util => src/e2e-app/test-util}/index.ts | 0 {e2e/util => src/e2e-app/test-util}/query.ts | 0 .../e2e-app/tsconfig-e2e.json | 0 21 files changed, 31 insertions(+), 41 deletions(-) delete mode 100644 e2e/index-e2e.spec.ts rename {e2e => src/e2e-app}/protractor.conf.js (100%) rename {e2e => src/e2e-app}/start-devserver.js (100%) rename {e2e/util => src/e2e-app/test-util}/actions.ts (100%) rename {e2e/util => src/e2e-app/test-util}/asserts.ts (100%) rename {e2e/util => src/e2e-app/test-util}/index.ts (100%) rename {e2e/util => src/e2e-app/test-util}/query.ts (100%) rename e2e/tsconfig.json => src/e2e-app/tsconfig-e2e.json (100%) diff --git a/e2e/BUILD.bazel b/e2e/BUILD.bazel index 402821ce181a..a4d35ff136cb 100644 --- a/e2e/BUILD.bazel +++ b/e2e/BUILD.bazel @@ -3,27 +3,17 @@ package(default_visibility=["//visibility:public"]) load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ts_library") -ts_library( - name = "e2e_utils_lib", - srcs = glob(["util/**/*.ts"]), - tsconfig = ":tsconfig.json", - deps = [ - "@npm//@types/jasmine", - "@npm//protractor" - ] -) - # For each spec file in the "components/" folder, we declare a Bazel target # that builds the JavaScript outputs for the e2e spec file. [ts_library( name = "%s_specs_lib" % spec_file, srcs = [spec_file], - tsconfig = ":tsconfig.json", + tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ "@npm//@types/jasmine", "@npm//@types/selenium-webdriver", "@npm//protractor", - ":e2e_utils_lib", + "//src/e2e-app:e2e_utils_lib", ] ) for spec_file in glob(["components/**/*.spec.ts"])] @@ -31,13 +21,13 @@ ts_library( # suite target that runs the given e2e spec against the e2e-app devserver. [protractor_web_test_suite( name = "%s_e2e" % spec_file, - configuration = ":protractor.conf.js", - on_prepare = ":start-devserver.js", + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ "@npm//protractor", ":%s_specs_lib" % spec_file, - ":e2e_utils_lib", + "//src/e2e-app:e2e_utils_lib", ], data = [ "@npm//@angular/bazel", diff --git a/e2e/components/block-scroll-strategy-e2e.spec.ts b/e2e/components/block-scroll-strategy-e2e.spec.ts index 5d80f7bcc74f..a5df903ff5f9 100644 --- a/e2e/components/block-scroll-strategy-e2e.spec.ts +++ b/e2e/components/block-scroll-strategy-e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, Key, element, by} from 'protractor'; -import {getScrollPosition} from '../util/index'; +import {getScrollPosition} from '../../src/e2e-app/test-util/index'; describe('scroll blocking', () => { diff --git a/e2e/components/dialog-e2e.spec.ts b/e2e/components/dialog-e2e.spec.ts index 1f8bac8c6f8c..be33ca6eec11 100644 --- a/e2e/components/dialog-e2e.spec.ts +++ b/e2e/components/dialog-e2e.spec.ts @@ -5,7 +5,7 @@ import { pressKeys, clickElementAtPoint, waitForElement, -} from '../util/index'; +} from '../../src/e2e-app/test-util/index'; describe('dialog', () => { beforeEach(async () => await browser.get('/dialog')); diff --git a/e2e/components/grid-list-e2e.spec.ts b/e2e/components/grid-list-e2e.spec.ts index f0cec6f60e50..fbb7454da822 100644 --- a/e2e/components/grid-list-e2e.spec.ts +++ b/e2e/components/grid-list-e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '../util/index'; +import {expectToExist} from '../../src/e2e-app/test-util/index'; describe('grid-list', () => { beforeEach(async () => await browser.get('/grid-list')); diff --git a/e2e/components/list-e2e.spec.ts b/e2e/components/list-e2e.spec.ts index 5d6881d42ada..39ae3df8d6ca 100644 --- a/e2e/components/list-e2e.spec.ts +++ b/e2e/components/list-e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '../util/index'; +import {expectToExist} from '../../src/e2e-app/test-util/index'; describe('list', () => { beforeEach(async () => await browser.get('/list')); diff --git a/e2e/components/mdc-menu-e2e.spec.ts b/e2e/components/mdc-menu-e2e.spec.ts index 5c2d5aa78751..5c051be12e7b 100644 --- a/e2e/components/mdc-menu-e2e.spec.ts +++ b/e2e/components/mdc-menu-e2e.spec.ts @@ -5,7 +5,7 @@ import { expectLocation, expectToExist, pressKeys, -} from '../util/index'; +} from '../../src/e2e-app/test-util/index'; const presenceOf = ExpectedConditions.presenceOf; const not = ExpectedConditions.not; diff --git a/e2e/components/mdc-slide-toggle-e2e.spec.ts b/e2e/components/mdc-slide-toggle-e2e.spec.ts index 6d0817f5af28..c38a4c013223 100644 --- a/e2e/components/mdc-slide-toggle-e2e.spec.ts +++ b/e2e/components/mdc-slide-toggle-e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, element, by, Key} from 'protractor'; -import {expectToExist} from '../util/index'; +import {expectToExist} from '../../src/e2e-app/test-util/index'; describe('slide-toggle', () => { diff --git a/e2e/components/menu-e2e.spec.ts b/e2e/components/menu-e2e.spec.ts index 15cb391bcafd..f096bd95e8cf 100644 --- a/e2e/components/menu-e2e.spec.ts +++ b/e2e/components/menu-e2e.spec.ts @@ -5,7 +5,7 @@ import { expectLocation, expectToExist, pressKeys, -} from '../util/index'; +} from '../../src/e2e-app/test-util/index'; const presenceOf = ExpectedConditions.presenceOf; const not = ExpectedConditions.not; diff --git a/e2e/components/progress-bar-e2e.spec.ts b/e2e/components/progress-bar-e2e.spec.ts index 280b09d44740..262990534aab 100644 --- a/e2e/components/progress-bar-e2e.spec.ts +++ b/e2e/components/progress-bar-e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '../util/index'; +import {expectToExist} from '../../src/e2e-app/test-util/index'; describe('progress-bar', () => { beforeEach(async () => await browser.get('/progress-bar')); diff --git a/e2e/components/slide-toggle-e2e.spec.ts b/e2e/components/slide-toggle-e2e.spec.ts index 531565fe4c8c..51d3fd1d0712 100644 --- a/e2e/components/slide-toggle-e2e.spec.ts +++ b/e2e/components/slide-toggle-e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, element, by, Key} from 'protractor'; -import {expectToExist} from '../util/index'; +import {expectToExist} from '../../src/e2e-app/test-util/index'; describe('slide-toggle', () => { diff --git a/e2e/components/stepper-e2e.spec.ts b/e2e/components/stepper-e2e.spec.ts index 21b691367d63..2791f5fa0d00 100644 --- a/e2e/components/stepper-e2e.spec.ts +++ b/e2e/components/stepper-e2e.spec.ts @@ -1,7 +1,7 @@ import {browser, by, element, ElementFinder, ExpectedConditions} from 'protractor'; import {Key} from 'selenium-webdriver'; -import {pressKeys} from '../util/actions'; -import {expectFocusOn, expectToExist} from '../util/asserts'; +import {pressKeys} from '../../src/e2e-app/test-util/actions'; +import {expectFocusOn, expectToExist} from '../../src/e2e-app/test-util/asserts'; describe('stepper', () => { beforeEach(async () => await browser.get('/stepper')); diff --git a/e2e/components/tabs-e2e.spec.ts b/e2e/components/tabs-e2e.spec.ts index 459bc049e999..345be363dedc 100644 --- a/e2e/components/tabs-e2e.spec.ts +++ b/e2e/components/tabs-e2e.spec.ts @@ -6,7 +6,7 @@ import { Key, ExpectedConditions } from 'protractor'; -import {pressKeys} from '../util/index'; +import {pressKeys} from '../../src/e2e-app/test-util/index'; describe('tabs', () => { describe('basic behavior', () => { diff --git a/e2e/index-e2e.spec.ts b/e2e/index-e2e.spec.ts deleted file mode 100644 index cae783b1569e..000000000000 --- a/e2e/index-e2e.spec.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {browser} from 'protractor'; - -describe('hello, protractor', () => { - describe('index', () => { - - beforeAll(async () => browser.get('/')); - - it('should have a title', async () => { - expect(await browser.getTitle()).toBe('Angular Material'); - }); - }); -}); diff --git a/src/e2e-app/BUILD.bazel b/src/e2e-app/BUILD.bazel index 43e839c0656f..858376a1b590 100644 --- a/src/e2e-app/BUILD.bazel +++ b/src/e2e-app/BUILD.bazel @@ -1,13 +1,25 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") -load("@npm_bazel_typescript//:defs.bzl", "ts_devserver") +load("@npm_bazel_typescript//:defs.bzl", "ts_devserver", "ts_library") load("//tools:defaults.bzl", "ng_module") load("//:packages.bzl", "ANGULAR_LIBRARY_UMDS") +exports_files(["protractor.conf.js", "start-devserver.js", "tsconfig-e2e.json"]) + +ts_library( + name = "e2e_utils_lib", + srcs = glob(["test-util/**/*.ts"]), + tsconfig = ":tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//protractor" + ] +) + ng_module( name = "e2e-app", - srcs = glob(["**/*.ts"]), + srcs = glob(["**/*.ts"], exclude = ["test-util/**"]), assets = glob(["**/*.html", "**/*.css"], exclude = ["index.html"]), deps = [ "@npm//@angular/core", diff --git a/e2e/protractor.conf.js b/src/e2e-app/protractor.conf.js similarity index 100% rename from e2e/protractor.conf.js rename to src/e2e-app/protractor.conf.js diff --git a/e2e/start-devserver.js b/src/e2e-app/start-devserver.js similarity index 100% rename from e2e/start-devserver.js rename to src/e2e-app/start-devserver.js diff --git a/e2e/util/actions.ts b/src/e2e-app/test-util/actions.ts similarity index 100% rename from e2e/util/actions.ts rename to src/e2e-app/test-util/actions.ts diff --git a/e2e/util/asserts.ts b/src/e2e-app/test-util/asserts.ts similarity index 100% rename from e2e/util/asserts.ts rename to src/e2e-app/test-util/asserts.ts diff --git a/e2e/util/index.ts b/src/e2e-app/test-util/index.ts similarity index 100% rename from e2e/util/index.ts rename to src/e2e-app/test-util/index.ts diff --git a/e2e/util/query.ts b/src/e2e-app/test-util/query.ts similarity index 100% rename from e2e/util/query.ts rename to src/e2e-app/test-util/query.ts diff --git a/e2e/tsconfig.json b/src/e2e-app/tsconfig-e2e.json similarity index 100% rename from e2e/tsconfig.json rename to src/e2e-app/tsconfig-e2e.json From dae84fecd47125bd85919d5bc37b5f10dc7b1d15 Mon Sep 17 00:00:00 2001 From: Miles Malerba Date: Fri, 24 May 2019 16:07:10 -0700 Subject: [PATCH 3/7] move e2e tests to the component's src dir --- e2e/BUILD.bazel | 36 ------------------- src/cdk-experimental/scrolling/BUILD.bazel | 32 ++++++++++++++++- .../scrolling/virtual-scroll.e2e.spec.ts | 0 src/cdk/overlay/BUILD.bazel | 32 ++++++++++++++++- .../scroll/block-scroll-strategy.e2e.spec.ts | 2 +- .../mdc-button/BUILD.bazel | 32 ++++++++++++++++- .../mdc-button/button.e2e.spec.ts | 0 .../mdc-card/BUILD.bazel | 32 ++++++++++++++++- .../mdc-card/card.e2e.spec.ts | 0 .../mdc-checkbox/BUILD.bazel | 32 ++++++++++++++++- .../mdc-checkbox/checkbox.e2e.spec.ts | 0 .../mdc-chips/BUILD.bazel | 32 ++++++++++++++++- .../mdc-chips/chips.e2e.spec.ts | 0 .../mdc-menu/BUILD.bazel | 32 ++++++++++++++++- .../mdc-menu/menu.e2e.spec.ts | 2 +- .../mdc-radio/BUILD.bazel | 32 ++++++++++++++++- .../mdc-radio/radio.e2e.spec.ts | 0 .../mdc-slide-toggle/BUILD.bazel | 32 ++++++++++++++++- .../mdc-slide-toggle/slide-toggle.e2e.spec.ts | 2 +- src/material/button-toggle/BUILD.bazel | 32 ++++++++++++++++- .../button-toggle/button-toggle.e2e.spec.ts | 0 src/material/button/BUILD.bazel | 32 ++++++++++++++++- .../material/button/button.e2e.spec.ts | 0 src/material/card/BUILD.bazel | 32 ++++++++++++++++- .../material/card/card.e2e.spec.ts | 0 src/material/checkbox/BUILD.bazel | 32 ++++++++++++++++- .../material/checkbox/checkbox.e2e.spec.ts | 0 src/material/dialog/BUILD.bazel | 32 ++++++++++++++++- .../material/dialog/dialog.e2e.spec.ts | 2 +- src/material/expansion/BUILD.bazel | 32 ++++++++++++++++- .../material/expansion/expansion.e2e.spec.ts | 0 src/material/grid-list/BUILD.bazel | 32 ++++++++++++++++- .../material/grid-list/grid-list.e2e.spec.ts | 2 +- src/material/icon/BUILD.bazel | 32 ++++++++++++++++- .../material/icon/icon.e2e.spec.ts | 0 src/material/input/BUILD.bazel | 32 ++++++++++++++++- .../material/input/input.e2e.spec.ts | 0 src/material/list/BUILD.bazel | 32 ++++++++++++++++- .../material/list/list.e2e.spec.ts | 2 +- src/material/menu/BUILD.bazel | 32 ++++++++++++++++- .../material/menu/menu.e2e.spec.ts | 2 +- src/material/progress-bar/BUILD.bazel | 32 ++++++++++++++++- .../progress-bar/progress-bar.e2e.spec.ts | 2 +- src/material/progress-spinner/BUILD.bazel | 32 ++++++++++++++++- .../progress-spinner.e2e.spec.ts | 0 src/material/radio/BUILD.bazel | 32 ++++++++++++++++- .../material/radio/radio.e2e.spec.ts | 0 src/material/sidenav/BUILD.bazel | 32 ++++++++++++++++- .../material/sidenav/sidenav.e2e.spec.ts | 0 src/material/slide-toggle/BUILD.bazel | 32 ++++++++++++++++- .../slide-toggle/slide-toggle.e2e.spec.ts | 2 +- src/material/stepper/BUILD.bazel | 32 ++++++++++++++++- .../material/stepper/stepper.e2e.spec.ts | 3 +- src/material/tabs/BUILD.bazel | 32 ++++++++++++++++- .../material/tabs/tabs.e2e.spec.ts | 2 +- src/material/toolbar/BUILD.bazel | 32 ++++++++++++++++- .../material/toolbar/toolbar.e2e.spec.ts | 0 57 files changed, 879 insertions(+), 76 deletions(-) delete mode 100644 e2e/BUILD.bazel rename e2e/components/virtual-scroll-e2e.spec.ts => src/cdk-experimental/scrolling/virtual-scroll.e2e.spec.ts (100%) rename e2e/components/block-scroll-strategy-e2e.spec.ts => src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts (98%) rename e2e/components/mdc-button-e2e.spec.ts => src/material-experimental/mdc-button/button.e2e.spec.ts (100%) rename e2e/components/mdc-card-e2e.spec.ts => src/material-experimental/mdc-card/card.e2e.spec.ts (100%) rename e2e/components/mdc-checkbox-e2e.spec.ts => src/material-experimental/mdc-checkbox/checkbox.e2e.spec.ts (100%) rename e2e/components/mdc-chips-e2e.spec.ts => src/material-experimental/mdc-chips/chips.e2e.spec.ts (100%) rename e2e/components/mdc-menu-e2e.spec.ts => src/material-experimental/mdc-menu/menu.e2e.spec.ts (99%) rename e2e/components/mdc-radio-e2e.spec.ts => src/material-experimental/mdc-radio/radio.e2e.spec.ts (100%) rename e2e/components/mdc-slide-toggle-e2e.spec.ts => src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts (97%) rename e2e/components/button-toggle-e2e.spec.ts => src/material/button-toggle/button-toggle.e2e.spec.ts (100%) rename e2e/components/button-e2e.spec.ts => src/material/button/button.e2e.spec.ts (100%) rename e2e/components/card-e2e.spec.ts => src/material/card/card.e2e.spec.ts (100%) rename e2e/components/checkbox-e2e.spec.ts => src/material/checkbox/checkbox.e2e.spec.ts (100%) rename e2e/components/dialog-e2e.spec.ts => src/material/dialog/dialog.e2e.spec.ts (98%) rename e2e/components/expansion-e2e.spec.ts => src/material/expansion/expansion.e2e.spec.ts (100%) rename e2e/components/grid-list-e2e.spec.ts => src/material/grid-list/grid-list.e2e.spec.ts (85%) rename e2e/components/icon-e2e.spec.ts => src/material/icon/icon.e2e.spec.ts (100%) rename e2e/components/input-e2e.spec.ts => src/material/input/input.e2e.spec.ts (100%) rename e2e/components/list-e2e.spec.ts => src/material/list/list.e2e.spec.ts (84%) rename e2e/components/menu-e2e.spec.ts => src/material/menu/menu.e2e.spec.ts (99%) rename e2e/components/progress-bar-e2e.spec.ts => src/material/progress-bar/progress-bar.e2e.spec.ts (91%) rename e2e/components/progress-spinner-e2e.spec.ts => src/material/progress-spinner/progress-spinner.e2e.spec.ts (100%) rename e2e/components/radio-e2e.spec.ts => src/material/radio/radio.e2e.spec.ts (100%) rename e2e/components/sidenav-e2e.spec.ts => src/material/sidenav/sidenav.e2e.spec.ts (100%) rename e2e/components/slide-toggle-e2e.spec.ts => src/material/slide-toggle/slide-toggle.e2e.spec.ts (97%) rename e2e/components/stepper-e2e.spec.ts => src/material/stepper/stepper.e2e.spec.ts (94%) rename e2e/components/tabs-e2e.spec.ts => src/material/tabs/tabs.e2e.spec.ts (98%) rename e2e/components/toolbar-e2e.spec.ts => src/material/toolbar/toolbar.e2e.spec.ts (100%) diff --git a/e2e/BUILD.bazel b/e2e/BUILD.bazel deleted file mode 100644 index a4d35ff136cb..000000000000 --- a/e2e/BUILD.bazel +++ /dev/null @@ -1,36 +0,0 @@ -package(default_visibility=["//visibility:public"]) - -load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") -load("//tools:defaults.bzl", "ts_library") - -# For each spec file in the "components/" folder, we declare a Bazel target -# that builds the JavaScript outputs for the e2e spec file. -[ts_library( - name = "%s_specs_lib" % spec_file, - srcs = [spec_file], - tsconfig = "//src/e2e-app:tsconfig-e2e.json", - deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", - ] - ) for spec_file in glob(["components/**/*.spec.ts"])] - -# For each spec file in the "components/" folder, we declare a Protractor web test -# suite target that runs the given e2e spec against the e2e-app devserver. -[protractor_web_test_suite( - name = "%s_e2e" % spec_file, - configuration = "//src/e2e-app:protractor.conf.js", - on_prepare = "//src/e2e-app:start-devserver.js", - server = "//src/e2e-app:devserver", - deps = [ - "@npm//protractor", - ":%s_specs_lib" % spec_file, - "//src/e2e-app:e2e_utils_lib", - ], - data = [ - "@npm//@angular/bazel", - "//tools/axe-protractor", - ], -) for spec_file in glob(["components/**/*.spec.ts"])] diff --git a/src/cdk-experimental/scrolling/BUILD.bazel b/src/cdk-experimental/scrolling/BUILD.bazel index 821691d1c145..53bb459add63 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_module", "ng_test_library", "ng_web_test_suite") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library") ng_module( name = "scrolling", @@ -28,3 +29,32 @@ ng_web_test_suite( name = "unit_tests", deps = [":unit_test_sources"] ) + +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) diff --git a/e2e/components/virtual-scroll-e2e.spec.ts b/src/cdk-experimental/scrolling/virtual-scroll.e2e.spec.ts similarity index 100% rename from e2e/components/virtual-scroll-e2e.spec.ts rename to src/cdk-experimental/scrolling/virtual-scroll.e2e.spec.ts diff --git a/src/cdk/overlay/BUILD.bazel b/src/cdk/overlay/BUILD.bazel index 3a622aae8704..c291358f4243 100644 --- a/src/cdk/overlay/BUILD.bazel +++ b/src/cdk/overlay/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "overlay", @@ -55,6 +56,35 @@ ng_web_test_suite( static_css = ["overlay_prebuilt_scss"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":overlay.md"], diff --git a/e2e/components/block-scroll-strategy-e2e.spec.ts b/src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts similarity index 98% rename from e2e/components/block-scroll-strategy-e2e.spec.ts rename to src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts index a5df903ff5f9..f1736ea4a701 100644 --- a/e2e/components/block-scroll-strategy-e2e.spec.ts +++ b/src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, Key, element, by} from 'protractor'; -import {getScrollPosition} from '../../src/e2e-app/test-util/index'; +import {getScrollPosition} from '../../../e2e-app/test-util'; describe('scroll blocking', () => { diff --git a/src/material-experimental/mdc-button/BUILD.bazel b/src/material-experimental/mdc-button/BUILD.bazel index 8c4186c06b16..f8e78888afcc 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_module") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_module", "ts_library") ng_module( name = "mdc-button", @@ -64,3 +65,32 @@ sass_binary( "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", ], ) + +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) diff --git a/e2e/components/mdc-button-e2e.spec.ts b/src/material-experimental/mdc-button/button.e2e.spec.ts similarity index 100% rename from e2e/components/mdc-button-e2e.spec.ts rename to src/material-experimental/mdc-button/button.e2e.spec.ts diff --git a/src/material-experimental/mdc-card/BUILD.bazel b/src/material-experimental/mdc-card/BUILD.bazel index 7d44288d2a59..124f85d815c5 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_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_module", "ts_library") ng_module( name = "mdc-card", @@ -27,3 +28,32 @@ sass_binary( name = "card_scss", src = "card.scss", ) + +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) diff --git a/e2e/components/mdc-card-e2e.spec.ts b/src/material-experimental/mdc-card/card.e2e.spec.ts similarity index 100% rename from e2e/components/mdc-card-e2e.spec.ts rename to src/material-experimental/mdc-card/card.e2e.spec.ts diff --git a/src/material-experimental/mdc-checkbox/BUILD.bazel b/src/material-experimental/mdc-checkbox/BUILD.bazel index 28711cdb8af8..34bdb071d00d 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_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library") ng_module( name = "mdc-checkbox", @@ -63,3 +64,32 @@ ng_web_test_suite( ":checkbox_tests_lib", ], ) + +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) diff --git a/e2e/components/mdc-checkbox-e2e.spec.ts b/src/material-experimental/mdc-checkbox/checkbox.e2e.spec.ts similarity index 100% rename from e2e/components/mdc-checkbox-e2e.spec.ts rename to src/material-experimental/mdc-checkbox/checkbox.e2e.spec.ts diff --git a/src/material-experimental/mdc-chips/BUILD.bazel b/src/material-experimental/mdc-chips/BUILD.bazel index 2fbd48860e04..75aca0115304 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_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_module", "ts_library") ng_module( name = "mdc-chips", @@ -37,3 +38,32 @@ sass_binary( "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", ] ) + +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) diff --git a/e2e/components/mdc-chips-e2e.spec.ts b/src/material-experimental/mdc-chips/chips.e2e.spec.ts similarity index 100% rename from e2e/components/mdc-chips-e2e.spec.ts rename to src/material-experimental/mdc-chips/chips.e2e.spec.ts diff --git a/src/material-experimental/mdc-menu/BUILD.bazel b/src/material-experimental/mdc-menu/BUILD.bazel index 9a935c2c96ba..a89ac9d5c3b7 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_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library") ng_module( name = "mdc-menu", @@ -64,3 +65,32 @@ ng_web_test_suite( ":menu_tests_lib", ], ) + +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) diff --git a/e2e/components/mdc-menu-e2e.spec.ts b/src/material-experimental/mdc-menu/menu.e2e.spec.ts similarity index 99% rename from e2e/components/mdc-menu-e2e.spec.ts rename to src/material-experimental/mdc-menu/menu.e2e.spec.ts index 5c051be12e7b..3985a079fa5a 100644 --- a/e2e/components/mdc-menu-e2e.spec.ts +++ b/src/material-experimental/mdc-menu/menu.e2e.spec.ts @@ -5,7 +5,7 @@ import { expectLocation, expectToExist, pressKeys, -} from '../../src/e2e-app/test-util/index'; +} from '../../e2e-app/test-util'; const presenceOf = ExpectedConditions.presenceOf; const not = ExpectedConditions.not; diff --git a/src/material-experimental/mdc-radio/BUILD.bazel b/src/material-experimental/mdc-radio/BUILD.bazel index 8ea919ec9630..bbc7c936ea41 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_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_module", "ts_library") ng_module( name = "mdc-radio", @@ -27,3 +28,32 @@ sass_binary( name = "radio_scss", src = "radio.scss", ) + +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) diff --git a/e2e/components/mdc-radio-e2e.spec.ts b/src/material-experimental/mdc-radio/radio.e2e.spec.ts similarity index 100% rename from e2e/components/mdc-radio-e2e.spec.ts rename to src/material-experimental/mdc-radio/radio.e2e.spec.ts diff --git a/src/material-experimental/mdc-slide-toggle/BUILD.bazel b/src/material-experimental/mdc-slide-toggle/BUILD.bazel index f15c7bfd1d78..3b0f1b022245 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_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library") ng_module( name = "mdc-slide-toggle", @@ -61,3 +62,32 @@ ng_web_test_suite( ":slide_toggle_tests_lib", ], ) + +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) diff --git a/e2e/components/mdc-slide-toggle-e2e.spec.ts b/src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts similarity index 97% rename from e2e/components/mdc-slide-toggle-e2e.spec.ts rename to src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts index c38a4c013223..29bda121b430 100644 --- a/e2e/components/mdc-slide-toggle-e2e.spec.ts +++ b/src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, element, by, Key} from 'protractor'; -import {expectToExist} from '../../src/e2e-app/test-util/index'; +import {expectToExist} from '../../e2e-app/test-util'; describe('slide-toggle', () => { diff --git a/src/material/button-toggle/BUILD.bazel b/src/material/button-toggle/BUILD.bazel index 14f9552f1e10..bcf7e2035cf7 100644 --- a/src/material/button-toggle/BUILD.bazel +++ b/src/material/button-toggle/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "button-toggle", @@ -50,6 +51,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":button-toggle.md"], diff --git a/e2e/components/button-toggle-e2e.spec.ts b/src/material/button-toggle/button-toggle.e2e.spec.ts similarity index 100% rename from e2e/components/button-toggle-e2e.spec.ts rename to src/material/button-toggle/button-toggle.e2e.spec.ts diff --git a/src/material/button/BUILD.bazel b/src/material/button/BUILD.bazel index 5a78aada36a0..ba5637f22983 100644 --- a/src/material/button/BUILD.bazel +++ b/src/material/button/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "button", @@ -50,6 +51,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":button.md"], diff --git a/e2e/components/button-e2e.spec.ts b/src/material/button/button.e2e.spec.ts similarity index 100% rename from e2e/components/button-e2e.spec.ts rename to src/material/button/button.e2e.spec.ts diff --git a/src/material/card/BUILD.bazel b/src/material/card/BUILD.bazel index 84e5ef0ed158..ffa494f270c2 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_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module", "markdown_to_html") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") +load("//tools:defaults.bzl", "ng_module", "markdown_to_html", "ts_library") ng_module( name = "card", @@ -29,6 +30,35 @@ sass_binary( ], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":card.md"], diff --git a/e2e/components/card-e2e.spec.ts b/src/material/card/card.e2e.spec.ts similarity index 100% rename from e2e/components/card-e2e.spec.ts rename to src/material/card/card.e2e.spec.ts diff --git a/src/material/checkbox/BUILD.bazel b/src/material/checkbox/BUILD.bazel index a90f46994403..db7cb735c7c5 100644 --- a/src/material/checkbox/BUILD.bazel +++ b/src/material/checkbox/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "checkbox", @@ -57,6 +58,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":checkbox.md"], diff --git a/e2e/components/checkbox-e2e.spec.ts b/src/material/checkbox/checkbox.e2e.spec.ts similarity index 100% rename from e2e/components/checkbox-e2e.spec.ts rename to src/material/checkbox/checkbox.e2e.spec.ts diff --git a/src/material/dialog/BUILD.bazel b/src/material/dialog/BUILD.bazel index 486f2a2459cb..d0377a0a386c 100644 --- a/src/material/dialog/BUILD.bazel +++ b/src/material/dialog/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "dialog", @@ -59,6 +60,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":dialog.md"], diff --git a/e2e/components/dialog-e2e.spec.ts b/src/material/dialog/dialog.e2e.spec.ts similarity index 98% rename from e2e/components/dialog-e2e.spec.ts rename to src/material/dialog/dialog.e2e.spec.ts index be33ca6eec11..0f2d8d35c092 100644 --- a/e2e/components/dialog-e2e.spec.ts +++ b/src/material/dialog/dialog.e2e.spec.ts @@ -5,7 +5,7 @@ import { pressKeys, clickElementAtPoint, waitForElement, -} from '../../src/e2e-app/test-util/index'; +} from '../../e2e-app/test-util'; describe('dialog', () => { beforeEach(async () => await browser.get('/dialog')); diff --git a/src/material/expansion/BUILD.bazel b/src/material/expansion/BUILD.bazel index 4431065288ae..4f415e1ac9af 100644 --- a/src/material/expansion/BUILD.bazel +++ b/src/material/expansion/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "expansion", @@ -64,6 +65,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":expansion.md"], diff --git a/e2e/components/expansion-e2e.spec.ts b/src/material/expansion/expansion.e2e.spec.ts similarity index 100% rename from e2e/components/expansion-e2e.spec.ts rename to src/material/expansion/expansion.e2e.spec.ts diff --git a/src/material/grid-list/BUILD.bazel b/src/material/grid-list/BUILD.bazel index 7162292990f4..bc5e8599fd83 100644 --- a/src/material/grid-list/BUILD.bazel +++ b/src/material/grid-list/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "grid-list", @@ -44,6 +45,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":grid-list.md"], diff --git a/e2e/components/grid-list-e2e.spec.ts b/src/material/grid-list/grid-list.e2e.spec.ts similarity index 85% rename from e2e/components/grid-list-e2e.spec.ts rename to src/material/grid-list/grid-list.e2e.spec.ts index fbb7454da822..541e1f03ad5c 100644 --- a/e2e/components/grid-list-e2e.spec.ts +++ b/src/material/grid-list/grid-list.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '../../src/e2e-app/test-util/index'; +import {expectToExist} from '../../e2e-app/test-util'; describe('grid-list', () => { beforeEach(async () => await browser.get('/grid-list')); diff --git a/src/material/icon/BUILD.bazel b/src/material/icon/BUILD.bazel index e5207f4c4444..54a31a022e5a 100644 --- a/src/material/icon/BUILD.bazel +++ b/src/material/icon/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "icon", @@ -47,6 +48,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":icon.md"], diff --git a/e2e/components/icon-e2e.spec.ts b/src/material/icon/icon.e2e.spec.ts similarity index 100% rename from e2e/components/icon-e2e.spec.ts rename to src/material/icon/icon.e2e.spec.ts diff --git a/src/material/input/BUILD.bazel b/src/material/input/BUILD.bazel index 4eb2a58f4138..24756c381513 100644 --- a/src/material/input/BUILD.bazel +++ b/src/material/input/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "input", @@ -51,6 +52,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":input.md"], diff --git a/e2e/components/input-e2e.spec.ts b/src/material/input/input.e2e.spec.ts similarity index 100% rename from e2e/components/input-e2e.spec.ts rename to src/material/input/input.e2e.spec.ts diff --git a/src/material/list/BUILD.bazel b/src/material/list/BUILD.bazel index 3f71dba472a4..8d77a24c2f6c 100644 --- a/src/material/list/BUILD.bazel +++ b/src/material/list/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "list", @@ -57,6 +58,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":list.md"], diff --git a/e2e/components/list-e2e.spec.ts b/src/material/list/list.e2e.spec.ts similarity index 84% rename from e2e/components/list-e2e.spec.ts rename to src/material/list/list.e2e.spec.ts index 39ae3df8d6ca..47803d4a9427 100644 --- a/e2e/components/list-e2e.spec.ts +++ b/src/material/list/list.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '../../src/e2e-app/test-util/index'; +import {expectToExist} from '../../e2e-app/test-util'; describe('list', () => { beforeEach(async () => await browser.get('/list')); diff --git a/src/material/menu/BUILD.bazel b/src/material/menu/BUILD.bazel index 4a6e105531bd..d0aac5b4f1e6 100644 --- a/src/material/menu/BUILD.bazel +++ b/src/material/menu/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "menu", @@ -62,6 +63,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":menu.md"], diff --git a/e2e/components/menu-e2e.spec.ts b/src/material/menu/menu.e2e.spec.ts similarity index 99% rename from e2e/components/menu-e2e.spec.ts rename to src/material/menu/menu.e2e.spec.ts index f096bd95e8cf..2c152665cb42 100644 --- a/e2e/components/menu-e2e.spec.ts +++ b/src/material/menu/menu.e2e.spec.ts @@ -5,7 +5,7 @@ import { expectLocation, expectToExist, pressKeys, -} from '../../src/e2e-app/test-util/index'; +} from '../../e2e-app/test-util'; const presenceOf = ExpectedConditions.presenceOf; const not = ExpectedConditions.not; diff --git a/src/material/progress-bar/BUILD.bazel b/src/material/progress-bar/BUILD.bazel index ec32cd28dd75..93222598977e 100644 --- a/src/material/progress-bar/BUILD.bazel +++ b/src/material/progress-bar/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "progress-bar", @@ -49,6 +50,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":progress-bar.md"], diff --git a/e2e/components/progress-bar-e2e.spec.ts b/src/material/progress-bar/progress-bar.e2e.spec.ts similarity index 91% rename from e2e/components/progress-bar-e2e.spec.ts rename to src/material/progress-bar/progress-bar.e2e.spec.ts index 262990534aab..26cd5b3db071 100644 --- a/e2e/components/progress-bar-e2e.spec.ts +++ b/src/material/progress-bar/progress-bar.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '../../src/e2e-app/test-util/index'; +import {expectToExist} from '../../e2e-app/test-util'; describe('progress-bar', () => { beforeEach(async () => await browser.get('/progress-bar')); diff --git a/src/material/progress-spinner/BUILD.bazel b/src/material/progress-spinner/BUILD.bazel index 67be895707a8..a8c442940c2b 100644 --- a/src/material/progress-spinner/BUILD.bazel +++ b/src/material/progress-spinner/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "progress-spinner", @@ -46,6 +47,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":progress-spinner.md"], diff --git a/e2e/components/progress-spinner-e2e.spec.ts b/src/material/progress-spinner/progress-spinner.e2e.spec.ts similarity index 100% rename from e2e/components/progress-spinner-e2e.spec.ts rename to src/material/progress-spinner/progress-spinner.e2e.spec.ts diff --git a/src/material/radio/BUILD.bazel b/src/material/radio/BUILD.bazel index d475adfc1305..597257977e72 100644 --- a/src/material/radio/BUILD.bazel +++ b/src/material/radio/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "radio", @@ -53,6 +54,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":radio.md"], diff --git a/e2e/components/radio-e2e.spec.ts b/src/material/radio/radio.e2e.spec.ts similarity index 100% rename from e2e/components/radio-e2e.spec.ts rename to src/material/radio/radio.e2e.spec.ts diff --git a/src/material/sidenav/BUILD.bazel b/src/material/sidenav/BUILD.bazel index 6f39c32dc87e..22baf210b2d9 100644 --- a/src/material/sidenav/BUILD.bazel +++ b/src/material/sidenav/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "sidenav", @@ -60,6 +61,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":sidenav.md"], diff --git a/e2e/components/sidenav-e2e.spec.ts b/src/material/sidenav/sidenav.e2e.spec.ts similarity index 100% rename from e2e/components/sidenav-e2e.spec.ts rename to src/material/sidenav/sidenav.e2e.spec.ts diff --git a/src/material/slide-toggle/BUILD.bazel b/src/material/slide-toggle/BUILD.bazel index 90eb014eec2e..410a21f1dcea 100644 --- a/src/material/slide-toggle/BUILD.bazel +++ b/src/material/slide-toggle/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "slide-toggle", @@ -56,6 +57,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":slide-toggle.md"], diff --git a/e2e/components/slide-toggle-e2e.spec.ts b/src/material/slide-toggle/slide-toggle.e2e.spec.ts similarity index 97% rename from e2e/components/slide-toggle-e2e.spec.ts rename to src/material/slide-toggle/slide-toggle.e2e.spec.ts index 51d3fd1d0712..fbae244ac4e2 100644 --- a/e2e/components/slide-toggle-e2e.spec.ts +++ b/src/material/slide-toggle/slide-toggle.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, element, by, Key} from 'protractor'; -import {expectToExist} from '../../src/e2e-app/test-util/index'; +import {expectToExist} from '../../e2e-app/test-util'; describe('slide-toggle', () => { diff --git a/src/material/stepper/BUILD.bazel b/src/material/stepper/BUILD.bazel index 10eace36c19f..137ceeaac8e0 100644 --- a/src/material/stepper/BUILD.bazel +++ b/src/material/stepper/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "stepper", @@ -69,6 +70,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":stepper.md"], diff --git a/e2e/components/stepper-e2e.spec.ts b/src/material/stepper/stepper.e2e.spec.ts similarity index 94% rename from e2e/components/stepper-e2e.spec.ts rename to src/material/stepper/stepper.e2e.spec.ts index 2791f5fa0d00..aedcca2877cb 100644 --- a/e2e/components/stepper-e2e.spec.ts +++ b/src/material/stepper/stepper.e2e.spec.ts @@ -1,7 +1,6 @@ import {browser, by, element, ElementFinder, ExpectedConditions} from 'protractor'; import {Key} from 'selenium-webdriver'; -import {pressKeys} from '../../src/e2e-app/test-util/actions'; -import {expectFocusOn, expectToExist} from '../../src/e2e-app/test-util/asserts'; +import {expectFocusOn, expectToExist, pressKeys} from '../../e2e-app/test-util'; describe('stepper', () => { beforeEach(async () => await browser.get('/stepper')); diff --git a/src/material/tabs/BUILD.bazel b/src/material/tabs/BUILD.bazel index a29013ca8423..646c96d86347 100644 --- a/src/material/tabs/BUILD.bazel +++ b/src/material/tabs/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "tabs", @@ -96,6 +97,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":tabs.md"], diff --git a/e2e/components/tabs-e2e.spec.ts b/src/material/tabs/tabs.e2e.spec.ts similarity index 98% rename from e2e/components/tabs-e2e.spec.ts rename to src/material/tabs/tabs.e2e.spec.ts index 345be363dedc..ec7c093ca353 100644 --- a/e2e/components/tabs-e2e.spec.ts +++ b/src/material/tabs/tabs.e2e.spec.ts @@ -6,7 +6,7 @@ import { Key, ExpectedConditions } from 'protractor'; -import {pressKeys} from '../../src/e2e-app/test-util/index'; +import {pressKeys} from '../../e2e-app/test-util'; describe('tabs', () => { describe('basic behavior', () => { diff --git a/src/material/toolbar/BUILD.bazel b/src/material/toolbar/BUILD.bazel index 9aec9464aeae..c2ca267e6fe5 100644 --- a/src/material/toolbar/BUILD.bazel +++ b/src/material/toolbar/BUILD.bazel @@ -1,8 +1,9 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") +load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html") + "markdown_to_html", "ts_library") ng_module( name = "toolbar", @@ -46,6 +47,35 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) +ts_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + tsconfig = "//src/e2e-app:tsconfig-e2e.json", + deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + "//src/e2e-app:e2e_utils_lib", + ] +) + +protractor_web_test_suite( + name = "e2e_tests", + tags = ["e2e"], + configuration = "//src/e2e-app:protractor.conf.js", + on_prepare = "//src/e2e-app:start-devserver.js", + server = "//src/e2e-app:devserver", + deps = [ + "@npm//protractor", + ":e2e_test_sources", + "//src/e2e-app:e2e_utils_lib", + ], + data = [ + "@npm//@angular/bazel", + "//tools/axe-protractor", + ], +) + markdown_to_html( name = "overview", srcs = [":toolbar.md"], diff --git a/e2e/components/toolbar-e2e.spec.ts b/src/material/toolbar/toolbar.e2e.spec.ts similarity index 100% rename from e2e/components/toolbar-e2e.spec.ts rename to src/material/toolbar/toolbar.e2e.spec.ts From 792f0d56829fc934ac632e6d20445f7c096da294 Mon Sep 17 00:00:00 2001 From: Miles Malerba Date: Fri, 24 May 2019 16:15:20 -0700 Subject: [PATCH 4/7] update owners and uses of gulp/bazel --- .circleci/config.yml | 8 +++---- .github/CODEOWNERS | 33 +-------------------------- DEV_ENVIRONMENT.md | 8 +++---- package.json | 4 ++-- tools/package-tools/rollup-globals.ts | 2 ++ 5 files changed, 13 insertions(+), 42 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bf384f094b51..e279b5f8813c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -131,7 +131,7 @@ jobs: - *setup_bazel_remote_execution - run: bazel build src/... --build_tag_filters=-docs-package - - run: bazel test src/... --build_tag_filters=-docs-package + - run: bazel test src/... --build_tag_filters=-docs-package --test_tag_filters=-e2e # Note: We want to save the cache in this job because the workspace cache also # includes the Bazel repository cache that will be updated in this job. @@ -168,7 +168,7 @@ jobs: - *copy_bazel_config - *setup_bazel_remote_execution - - run: bazel test e2e/... + - run: bazel test src/... --test_tag_filters=e2e # ------------------------------------------------------------------------------------------ # Job that runs the unit tests on locally installed browsers (Chrome and Firefox headless). @@ -376,7 +376,7 @@ jobs: - run: sed -i "s/\(_ENABLE_NG_TYPE_CHECKING = \)True/\1False/g" tools/defaults.bzl # Run project tests with ngtsc and the Ivy Angular packages. - run: bazel build src/... --build_tag_filters=-docs-package --define=compile=aot - - run: bazel test src/... --build_tag_filters=-docs-package --define=compile=aot + - run: bazel test src/... --build_tag_filters=-docs-package --define=compile=aot --test_tag_filters=-e2e # ---------------------------------------------------------------------------- # Job that runs all Bazel tests against Ivy from angular/angular#master. @@ -401,7 +401,7 @@ jobs: - run: sed -i "s/\(_ENABLE_NG_TYPE_CHECKING = \)True/\1False/g" tools/defaults.bzl # Run project tests with ngtsc and the Ivy Angular packages. - run: bazel build src/... --build_tag_filters=-docs-package --define=compile=aot - - run: bazel test src/... --build_tag_filters=-docs-package --define=compile=aot + - run: bazel test src/... --build_tag_filters=-docs-package --define=compile=aot --test_tag_filters=-e2e # ---------------------------------------------------------------------------------------- # Workflow definitions. A workflow usually groups multiple jobs together. This is useful if diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2a16fd8b12b8..aa3502f15385 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -171,38 +171,6 @@ /src/dev-app/virtual-scroll/** @mmalerba # E2E app -/e2e/* @jelbourn -/e2e/components/block-scroll-strategy-e2e.spec.ts @andrewseguin @crisbeto -/e2e/components/button-e2e.spec.ts @jelbourn -/e2e/components/button-toggle-e2e.spec.ts @jelbourn -/e2e/components/card-e2e.spec.ts @jelbourn -/e2e/components/checkbox-e2e.spec.ts @jelbourn @devversion -/e2e/components/dialog-e2e.spec.ts @jelbourn @crisbeto -/e2e/components/expansion-e2e.spec.ts @josephperrott @jelbourn -/e2e/components/grid-list-e2e.spec.ts @jelbourn -/e2e/components/icon-e2e.spec.ts @jelbourn -/e2e/components/input-e2e.spec.ts @mmalerba -/e2e/components/list-e2e.spec.ts @jelbourn @crisbeto @devversion -/e2e/components/mdc-button-e2e.spec.ts @andrewseguin -# Note to implementer: please repossess -/e2e/components/mdc-card-e2e.spec.ts @mmalerba -/e2e/components/mdc-checkbox-e2e.spec.ts @mmalerba -/e2e/components/mdc-chips-e2e.spec.ts @mmalerba -/e2e/components/mdc-menu-e2e.spec.ts @crisbeto -# Note to implementer: please repossess -/e2e/components/mdc-radio-e2e.spec.ts @mmalerba -/e2e/components/mdc-slide-toggle-e2e.spec.ts @crisbeto -/e2e/components/menu-e2e.spec.ts @crisbeto -/e2e/components/progress-bar-e2e.spec.ts @jelbourn @crisbeto @josephperrott -/e2e/components/progress-spinner-e2e.spec.ts @jelbourn @crisbeto @josephperrott -/e2e/components/radio-e2e.spec.ts @jelbourn @devversion -/e2e/components/sidenav-e2e.spec.ts @mmalerba -/e2e/components/slide-toggle-e2e.spec.ts @devversion -/e2e/components/stepper-e2e.spec.ts @mmalerba -/e2e/components/tabs-e2e.spec.ts @andrewseguin -/e2e/components/toolbar-e2e.spec.ts @devversion -/e2e/components/virtual-scroll-e2e.spec.ts @mmalerba -/e2e/util/** @jelbourn /src/e2e-app/* @jelbourn /src/e2e-app/block-scroll-strategy/** @andrewseguin @crisbeto /src/e2e-app/button/** @jelbourn @@ -234,6 +202,7 @@ /src/e2e-app/slide-toggle/** @devversion /src/e2e-app/stepper/** @mmalerba /src/e2e-app/tabs/** @andrewseguin +/src/e2e-app/test-util/** @jelbourn /src/e2e-app/toolbar/** @devversion /src/e2e-app/virtual-scroll/** @mmalerba diff --git a/DEV_ENVIRONMENT.md b/DEV_ENVIRONMENT.md index 06a6d3fd25bc..bba463742432 100644 --- a/DEV_ENVIRONMENT.md +++ b/DEV_ENVIRONMENT.md @@ -13,11 +13,11 @@ To build Material in dev mode, run `gulp material:build`. To build Material in release mode, run `gulp material:build-release` -To bring up a local server, run `gulp serve:devapp`. This will automatically watch for changes +To bring up a local server, run `yarn dev-app`. This will automatically watch for changes and rebuild. The browser should refresh automatically when changes are made. ### Running tests -To run unit tests, run `gulp test`. -To run the e2e tests, run `gulp e2e`. -To run lint, run `gulp lint`. +To run unit tests, run `yarn test`. +To run the e2e tests, run `yarn e2e`. +To run lint, run `yarn lint`. diff --git a/package.json b/package.json index 7c316a28796d..dd6df79e3ba5 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,9 @@ "postinstall": "ngc -p angular-tsconfig.json", "build": "gulp build-release-packages", "dev-app": "gulp serve:devapp", - "test": "bazel test //src/...", + "test": "bazel test //src/... --test_tag_filters=-e2e", "lint": "gulp lint", - "e2e": "bazel test //e2e/...", + "e2e": "bazel test //src/... --test_tag_filters=e2e", "deploy": "gulp deploy:devapp", "webdriver-manager": "webdriver-manager", "breaking-changes": "gulp breaking-changes", diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts index 2da5ccf3d21d..a6444f1b79dc 100644 --- a/tools/package-tools/rollup-globals.ts +++ b/tools/package-tools/rollup-globals.ts @@ -48,6 +48,8 @@ const rollupCdkExperimentalEntryPoints = export const rollupGlobals = { 'moment': 'moment', 'tslib': 'tslib', + 'protractor': 'protractor', + 'selenium-webdriver': 'selenium-webdriver', // MDC Web '@material/animation': 'mdc.animation', From 184ee37caaedecd6401122d548298fba5ded8e8a Mon Sep 17 00:00:00 2001 From: Miles Malerba Date: Fri, 24 May 2019 16:44:46 -0700 Subject: [PATCH 5/7] fix some targets I missed when renaming --- src/cdk/drag-drop/BUILD.bazel | 4 ++-- src/cdk/text-field/BUILD.bazel | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cdk/drag-drop/BUILD.bazel b/src/cdk/drag-drop/BUILD.bazel index ac195d9c4af4..5197946c3a49 100644 --- a/src/cdk/drag-drop/BUILD.bazel +++ b/src/cdk/drag-drop/BUILD.bazel @@ -19,7 +19,7 @@ ng_module( ) ng_test_library( - name = "drag-unit_test_sources", + name = "unit_test_sources", srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//rxjs", @@ -32,7 +32,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":drag-unit_test_sources"], + deps = [":unit_test_sources"], ) markdown_to_html( diff --git a/src/cdk/text-field/BUILD.bazel b/src/cdk/text-field/BUILD.bazel index f088ecb43364..e950336d14d0 100644 --- a/src/cdk/text-field/BUILD.bazel +++ b/src/cdk/text-field/BUILD.bazel @@ -28,7 +28,7 @@ sass_binary( ) ng_test_library( - name = "text-unit_test_sources", + name = "unit_test_sources", srcs = glob(["**/*.spec.ts"], exclude = ["**/*.e2e.spec.ts"]), deps = [ "@npm//@angular/forms", @@ -42,7 +42,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":text-unit_test_sources"], + deps = [":unit_test_sources"], static_css = [":text_field_prebuilt_scss"] ) From c61cd5b6e07d72f88377bc0a7016925baa6a2af0 Mon Sep 17 00:00:00 2001 From: Miles Malerba Date: Tue, 28 May 2019 14:08:44 -0700 Subject: [PATCH 6/7] move e2e test utils under @angular/cdk/testing --- src/cdk-experimental/scrolling/BUILD.bazel | 13 ++++--------- src/cdk-experimental/tsconfig-tests.json | 3 +++ src/cdk/overlay/BUILD.bazel | 13 ++++--------- .../scroll/block-scroll-strategy.e2e.spec.ts | 2 +- src/cdk/testing/e2e/BUILD.bazel | 11 +++++++++++ .../test-util => cdk/testing/e2e}/actions.ts | 0 .../test-util => cdk/testing/e2e}/asserts.ts | 0 src/{e2e-app/test-util => cdk/testing/e2e}/index.ts | 0 src/{e2e-app/test-util => cdk/testing/e2e}/query.ts | 0 src/cdk/tsconfig-tests.json | 5 ++++- src/e2e-app/BUILD.bazel | 12 +----------- src/e2e-app/tsconfig-e2e.json | 8 -------- src/material-experimental/mdc-button/BUILD.bazel | 13 ++++--------- src/material-experimental/mdc-card/BUILD.bazel | 13 ++++--------- src/material-experimental/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-menu/menu.e2e.spec.ts | 2 +- src/material-experimental/mdc-radio/BUILD.bazel | 13 ++++--------- .../mdc-slide-toggle/BUILD.bazel | 13 ++++--------- .../mdc-slide-toggle/slide-toggle.e2e.spec.ts | 2 +- src/material-experimental/tsconfig-tests.json | 3 +++ src/material/button-toggle/BUILD.bazel | 13 ++++--------- src/material/button/BUILD.bazel | 13 ++++--------- src/material/card/BUILD.bazel | 13 ++++--------- src/material/checkbox/BUILD.bazel | 13 ++++--------- src/material/dialog/BUILD.bazel | 13 ++++--------- src/material/dialog/dialog.e2e.spec.ts | 2 +- src/material/expansion/BUILD.bazel | 13 ++++--------- src/material/grid-list/BUILD.bazel | 13 ++++--------- src/material/grid-list/grid-list.e2e.spec.ts | 2 +- src/material/icon/BUILD.bazel | 13 ++++--------- src/material/input/BUILD.bazel | 13 ++++--------- src/material/list/BUILD.bazel | 13 ++++--------- src/material/list/list.e2e.spec.ts | 2 +- src/material/menu/BUILD.bazel | 13 ++++--------- src/material/menu/menu.e2e.spec.ts | 2 +- src/material/progress-bar/BUILD.bazel | 13 ++++--------- src/material/progress-bar/progress-bar.e2e.spec.ts | 2 +- src/material/progress-spinner/BUILD.bazel | 13 ++++--------- src/material/radio/BUILD.bazel | 13 ++++--------- src/material/sidenav/BUILD.bazel | 13 ++++--------- src/material/slide-toggle/BUILD.bazel | 13 ++++--------- src/material/slide-toggle/slide-toggle.e2e.spec.ts | 2 +- src/material/stepper/BUILD.bazel | 13 ++++--------- src/material/stepper/stepper.e2e.spec.ts | 2 +- src/material/tabs/BUILD.bazel | 13 ++++--------- src/material/tabs/tabs.e2e.spec.ts | 2 +- src/material/toolbar/BUILD.bazel | 13 ++++--------- src/material/tsconfig-tests.json | 3 ++- tools/defaults.bzl | 13 +++++++++++++ 51 files changed, 160 insertions(+), 284 deletions(-) create mode 100644 src/cdk/testing/e2e/BUILD.bazel rename src/{e2e-app/test-util => cdk/testing/e2e}/actions.ts (100%) rename src/{e2e-app/test-util => cdk/testing/e2e}/asserts.ts (100%) rename src/{e2e-app/test-util => cdk/testing/e2e}/index.ts (100%) rename src/{e2e-app/test-util => cdk/testing/e2e}/query.ts (100%) delete mode 100644 src/e2e-app/tsconfig-e2e.json diff --git a/src/cdk-experimental/scrolling/BUILD.bazel b/src/cdk-experimental/scrolling/BUILD.bazel index 53bb459add63..7c8234b1e269 100644 --- a/src/cdk-experimental/scrolling/BUILD.bazel +++ b/src/cdk-experimental/scrolling/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") -load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ng_e2e_test_library") ng_module( name = "scrolling", @@ -30,15 +30,11 @@ ng_web_test_suite( deps = [":unit_test_sources"] ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -49,9 +45,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/cdk-experimental/tsconfig-tests.json b/src/cdk-experimental/tsconfig-tests.json index 2ad689835068..acd1ac36b8e1 100644 --- a/src/cdk-experimental/tsconfig-tests.json +++ b/src/cdk-experimental/tsconfig-tests.json @@ -27,5 +27,8 @@ // Include the index.ts for each secondary entry-point "./*/index.ts", "**/*.spec.ts" + ], + "exclude": [ + "**/*.e2e.spec.ts" ] } diff --git a/src/cdk/overlay/BUILD.bazel b/src/cdk/overlay/BUILD.bazel index c291358f4243..f8dabd2b2408 100644 --- a/src/cdk/overlay/BUILD.bazel +++ b/src/cdk/overlay/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "overlay", @@ -56,15 +56,11 @@ ng_web_test_suite( static_css = ["overlay_prebuilt_scss"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -75,9 +71,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts b/src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts index f1736ea4a701..ec1c15cf4a21 100644 --- a/src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts +++ b/src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, Key, element, by} from 'protractor'; -import {getScrollPosition} from '../../../e2e-app/test-util'; +import {getScrollPosition} from '@angular/cdk/testing/e2e'; describe('scroll blocking', () => { diff --git a/src/cdk/testing/e2e/BUILD.bazel b/src/cdk/testing/e2e/BUILD.bazel new file mode 100644 index 000000000000..450808697ffd --- /dev/null +++ b/src/cdk/testing/e2e/BUILD.bazel @@ -0,0 +1,11 @@ +package(default_visibility=["//visibility:public"]) + +load("//tools:defaults.bzl", "ng_e2e_test_library") + +exports_files(["tsconfig-e2e.json"]) + +ng_e2e_test_library( + name = "e2e", + srcs = glob(["**/*.ts"]), + module_name = "@angular/cdk/testing/e2e" +) diff --git a/src/e2e-app/test-util/actions.ts b/src/cdk/testing/e2e/actions.ts similarity index 100% rename from src/e2e-app/test-util/actions.ts rename to src/cdk/testing/e2e/actions.ts diff --git a/src/e2e-app/test-util/asserts.ts b/src/cdk/testing/e2e/asserts.ts similarity index 100% rename from src/e2e-app/test-util/asserts.ts rename to src/cdk/testing/e2e/asserts.ts diff --git a/src/e2e-app/test-util/index.ts b/src/cdk/testing/e2e/index.ts similarity index 100% rename from src/e2e-app/test-util/index.ts rename to src/cdk/testing/e2e/index.ts diff --git a/src/e2e-app/test-util/query.ts b/src/cdk/testing/e2e/query.ts similarity index 100% rename from src/e2e-app/test-util/query.ts rename to src/cdk/testing/e2e/query.ts diff --git a/src/cdk/tsconfig-tests.json b/src/cdk/tsconfig-tests.json index a7d64bc5e883..765e8e3fb52f 100644 --- a/src/cdk/tsconfig-tests.json +++ b/src/cdk/tsconfig-tests.json @@ -34,6 +34,9 @@ "**/*.spec.ts" ], "exclude": [ - "**/schematics/**/*.ts" + "**/schematics/**/*.ts", + // Exclude end-to-end tests and utilities + "**/*.e2e.spec.ts", + "./testing/e2e/**" ] } diff --git a/src/e2e-app/BUILD.bazel b/src/e2e-app/BUILD.bazel index 858376a1b590..9662d67c70f3 100644 --- a/src/e2e-app/BUILD.bazel +++ b/src/e2e-app/BUILD.bazel @@ -5,17 +5,7 @@ load("@npm_bazel_typescript//:defs.bzl", "ts_devserver", "ts_library") load("//tools:defaults.bzl", "ng_module") load("//:packages.bzl", "ANGULAR_LIBRARY_UMDS") -exports_files(["protractor.conf.js", "start-devserver.js", "tsconfig-e2e.json"]) - -ts_library( - name = "e2e_utils_lib", - srcs = glob(["test-util/**/*.ts"]), - tsconfig = ":tsconfig-e2e.json", - deps = [ - "@npm//@types/jasmine", - "@npm//protractor" - ] -) +exports_files(["protractor.conf.js", "start-devserver.js"]) ng_module( name = "e2e-app", diff --git a/src/e2e-app/tsconfig-e2e.json b/src/e2e-app/tsconfig-e2e.json deleted file mode 100644 index 170ed637d77a..000000000000 --- a/src/e2e-app/tsconfig-e2e.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "compilerOptions": { - "lib": ["es2015"], - "types": [ - "jasmine" - ] - } -} diff --git a/src/material-experimental/mdc-button/BUILD.bazel b/src/material-experimental/mdc-button/BUILD.bazel index f8e78888afcc..bf72312bc5de 100644 --- a/src/material-experimental/mdc-button/BUILD.bazel +++ b/src/material-experimental/mdc-button/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") -load("//tools:defaults.bzl", "ng_module", "ts_library") +load("//tools:defaults.bzl", "ng_module", "ng_e2e_test_library") ng_module( name = "mdc-button", @@ -66,15 +66,11 @@ sass_binary( ], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -85,9 +81,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material-experimental/mdc-card/BUILD.bazel b/src/material-experimental/mdc-card/BUILD.bazel index 124f85d815c5..77fc816fa3f5 100644 --- a/src/material-experimental/mdc-card/BUILD.bazel +++ b/src/material-experimental/mdc-card/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") -load("//tools:defaults.bzl", "ng_module", "ts_library") +load("//tools:defaults.bzl", "ng_module", "ng_e2e_test_library") ng_module( name = "mdc-card", @@ -29,15 +29,11 @@ sass_binary( src = "card.scss", ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -48,9 +44,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material-experimental/mdc-checkbox/BUILD.bazel b/src/material-experimental/mdc-checkbox/BUILD.bazel index 34bdb071d00d..b36ae14b99cb 100644 --- a/src/material-experimental/mdc-checkbox/BUILD.bazel +++ b/src/material-experimental/mdc-checkbox/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") -load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ng_e2e_test_library") ng_module( name = "mdc-checkbox", @@ -65,15 +65,11 @@ ng_web_test_suite( ], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -84,9 +80,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material-experimental/mdc-chips/BUILD.bazel b/src/material-experimental/mdc-chips/BUILD.bazel index 75aca0115304..c3cbfe036524 100644 --- a/src/material-experimental/mdc-chips/BUILD.bazel +++ b/src/material-experimental/mdc-chips/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") -load("//tools:defaults.bzl", "ng_module", "ts_library") +load("//tools:defaults.bzl", "ng_module", "ng_e2e_test_library") ng_module( name = "mdc-chips", @@ -39,15 +39,11 @@ sass_binary( ] ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -58,9 +54,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material-experimental/mdc-menu/BUILD.bazel b/src/material-experimental/mdc-menu/BUILD.bazel index a89ac9d5c3b7..4e20d4fc2d44 100644 --- a/src/material-experimental/mdc-menu/BUILD.bazel +++ b/src/material-experimental/mdc-menu/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") -load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ng_e2e_test_library") ng_module( name = "mdc-menu", @@ -66,15 +66,11 @@ ng_web_test_suite( ], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -85,9 +81,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material-experimental/mdc-menu/menu.e2e.spec.ts b/src/material-experimental/mdc-menu/menu.e2e.spec.ts index 3985a079fa5a..4a79dddc37f3 100644 --- a/src/material-experimental/mdc-menu/menu.e2e.spec.ts +++ b/src/material-experimental/mdc-menu/menu.e2e.spec.ts @@ -5,7 +5,7 @@ import { expectLocation, expectToExist, pressKeys, -} from '../../e2e-app/test-util'; +} from '@angular/cdk/testing/e2e'; const presenceOf = ExpectedConditions.presenceOf; const not = ExpectedConditions.not; diff --git a/src/material-experimental/mdc-radio/BUILD.bazel b/src/material-experimental/mdc-radio/BUILD.bazel index bbc7c936ea41..90d8f80b05b2 100644 --- a/src/material-experimental/mdc-radio/BUILD.bazel +++ b/src/material-experimental/mdc-radio/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") -load("//tools:defaults.bzl", "ng_module", "ts_library") +load("//tools:defaults.bzl", "ng_module", "ng_e2e_test_library") ng_module( name = "mdc-radio", @@ -29,15 +29,11 @@ sass_binary( src = "radio.scss", ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -48,9 +44,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material-experimental/mdc-slide-toggle/BUILD.bazel b/src/material-experimental/mdc-slide-toggle/BUILD.bazel index 3b0f1b022245..ad574d24cfd8 100644 --- a/src/material-experimental/mdc-slide-toggle/BUILD.bazel +++ b/src/material-experimental/mdc-slide-toggle/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") -load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ng_e2e_test_library") ng_module( name = "mdc-slide-toggle", @@ -63,15 +63,11 @@ ng_web_test_suite( ], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -82,9 +78,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts b/src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts index 29bda121b430..6401e51e5f0b 100644 --- a/src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts +++ b/src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, element, by, Key} from 'protractor'; -import {expectToExist} from '../../e2e-app/test-util'; +import {expectToExist} from '@angular/cdk/testing/e2e'; describe('slide-toggle', () => { diff --git a/src/material-experimental/tsconfig-tests.json b/src/material-experimental/tsconfig-tests.json index 5b90d3a0c83d..62da588b9ccd 100644 --- a/src/material-experimental/tsconfig-tests.json +++ b/src/material-experimental/tsconfig-tests.json @@ -23,5 +23,8 @@ // Include the index.ts for each secondary entry-point "./*/index.ts", "**/*.spec.ts" + ], + "exclude": [ + "**/*.e2e.spec.ts" ] } diff --git a/src/material/button-toggle/BUILD.bazel b/src/material/button-toggle/BUILD.bazel index bcf7e2035cf7..1cbd25410f44 100644 --- a/src/material/button-toggle/BUILD.bazel +++ b/src/material/button-toggle/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "button-toggle", @@ -51,15 +51,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -70,9 +66,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/button/BUILD.bazel b/src/material/button/BUILD.bazel index ba5637f22983..4b41cae455bd 100644 --- a/src/material/button/BUILD.bazel +++ b/src/material/button/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "button", @@ -51,15 +51,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -70,9 +66,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/card/BUILD.bazel b/src/material/card/BUILD.bazel index ffa494f270c2..c7d7f6efa80c 100644 --- a/src/material/card/BUILD.bazel +++ b/src/material/card/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") -load("//tools:defaults.bzl", "ng_module", "markdown_to_html", "ts_library") +load("//tools:defaults.bzl", "ng_module", "markdown_to_html", "ng_e2e_test_library") ng_module( name = "card", @@ -30,15 +30,11 @@ sass_binary( ], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -49,9 +45,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/checkbox/BUILD.bazel b/src/material/checkbox/BUILD.bazel index db7cb735c7c5..fbe36a71850e 100644 --- a/src/material/checkbox/BUILD.bazel +++ b/src/material/checkbox/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "checkbox", @@ -58,15 +58,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -77,9 +73,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/dialog/BUILD.bazel b/src/material/dialog/BUILD.bazel index d0377a0a386c..dde2efaf3b67 100644 --- a/src/material/dialog/BUILD.bazel +++ b/src/material/dialog/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "dialog", @@ -60,15 +60,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -79,9 +75,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/dialog/dialog.e2e.spec.ts b/src/material/dialog/dialog.e2e.spec.ts index 0f2d8d35c092..2ac803f3ee83 100644 --- a/src/material/dialog/dialog.e2e.spec.ts +++ b/src/material/dialog/dialog.e2e.spec.ts @@ -5,7 +5,7 @@ import { pressKeys, clickElementAtPoint, waitForElement, -} from '../../e2e-app/test-util'; +} from '@angular/cdk/testing/e2e'; describe('dialog', () => { beforeEach(async () => await browser.get('/dialog')); diff --git a/src/material/expansion/BUILD.bazel b/src/material/expansion/BUILD.bazel index 4f415e1ac9af..b9f6dd55f3ce 100644 --- a/src/material/expansion/BUILD.bazel +++ b/src/material/expansion/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "expansion", @@ -65,15 +65,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -84,9 +80,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/grid-list/BUILD.bazel b/src/material/grid-list/BUILD.bazel index bc5e8599fd83..a29c8c6ccb88 100644 --- a/src/material/grid-list/BUILD.bazel +++ b/src/material/grid-list/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "grid-list", @@ -45,15 +45,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -64,9 +60,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/grid-list/grid-list.e2e.spec.ts b/src/material/grid-list/grid-list.e2e.spec.ts index 541e1f03ad5c..b3b0f1b74c55 100644 --- a/src/material/grid-list/grid-list.e2e.spec.ts +++ b/src/material/grid-list/grid-list.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '../../e2e-app/test-util'; +import {expectToExist} from '@angular/cdk/testing/e2e'; describe('grid-list', () => { beforeEach(async () => await browser.get('/grid-list')); diff --git a/src/material/icon/BUILD.bazel b/src/material/icon/BUILD.bazel index 54a31a022e5a..7480f187e907 100644 --- a/src/material/icon/BUILD.bazel +++ b/src/material/icon/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "icon", @@ -48,15 +48,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -67,9 +63,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/input/BUILD.bazel b/src/material/input/BUILD.bazel index 24756c381513..99efe3e7a466 100644 --- a/src/material/input/BUILD.bazel +++ b/src/material/input/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "input", @@ -52,15 +52,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -71,9 +67,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/list/BUILD.bazel b/src/material/list/BUILD.bazel index 8d77a24c2f6c..124c39195a2b 100644 --- a/src/material/list/BUILD.bazel +++ b/src/material/list/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "list", @@ -58,15 +58,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -77,9 +73,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/list/list.e2e.spec.ts b/src/material/list/list.e2e.spec.ts index 47803d4a9427..8795501bcf67 100644 --- a/src/material/list/list.e2e.spec.ts +++ b/src/material/list/list.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '../../e2e-app/test-util'; +import {expectToExist} from '@angular/cdk/testing/e2e'; describe('list', () => { beforeEach(async () => await browser.get('/list')); diff --git a/src/material/menu/BUILD.bazel b/src/material/menu/BUILD.bazel index d0aac5b4f1e6..c7330d6a68cf 100644 --- a/src/material/menu/BUILD.bazel +++ b/src/material/menu/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "menu", @@ -63,15 +63,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -82,9 +78,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/menu/menu.e2e.spec.ts b/src/material/menu/menu.e2e.spec.ts index 2c152665cb42..96914679dda0 100644 --- a/src/material/menu/menu.e2e.spec.ts +++ b/src/material/menu/menu.e2e.spec.ts @@ -5,7 +5,7 @@ import { expectLocation, expectToExist, pressKeys, -} from '../../e2e-app/test-util'; +} from '@angular/cdk/testing/e2e'; const presenceOf = ExpectedConditions.presenceOf; const not = ExpectedConditions.not; diff --git a/src/material/progress-bar/BUILD.bazel b/src/material/progress-bar/BUILD.bazel index 93222598977e..607dbe554ff5 100644 --- a/src/material/progress-bar/BUILD.bazel +++ b/src/material/progress-bar/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "progress-bar", @@ -50,15 +50,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -69,9 +65,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/progress-bar/progress-bar.e2e.spec.ts b/src/material/progress-bar/progress-bar.e2e.spec.ts index 26cd5b3db071..3c2d7ccf8a19 100644 --- a/src/material/progress-bar/progress-bar.e2e.spec.ts +++ b/src/material/progress-bar/progress-bar.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '../../e2e-app/test-util'; +import {expectToExist} from '@angular/cdk/testing/e2e'; describe('progress-bar', () => { beforeEach(async () => await browser.get('/progress-bar')); diff --git a/src/material/progress-spinner/BUILD.bazel b/src/material/progress-spinner/BUILD.bazel index a8c442940c2b..b15d882953b2 100644 --- a/src/material/progress-spinner/BUILD.bazel +++ b/src/material/progress-spinner/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "progress-spinner", @@ -47,15 +47,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -66,9 +62,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/radio/BUILD.bazel b/src/material/radio/BUILD.bazel index 597257977e72..f746dd6fdcb5 100644 --- a/src/material/radio/BUILD.bazel +++ b/src/material/radio/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "radio", @@ -54,15 +54,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -73,9 +69,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/sidenav/BUILD.bazel b/src/material/sidenav/BUILD.bazel index 22baf210b2d9..376325c2bbdf 100644 --- a/src/material/sidenav/BUILD.bazel +++ b/src/material/sidenav/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "sidenav", @@ -61,15 +61,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -80,9 +76,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/slide-toggle/BUILD.bazel b/src/material/slide-toggle/BUILD.bazel index 410a21f1dcea..25b2be4121ae 100644 --- a/src/material/slide-toggle/BUILD.bazel +++ b/src/material/slide-toggle/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "slide-toggle", @@ -57,15 +57,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -76,9 +72,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/slide-toggle/slide-toggle.e2e.spec.ts b/src/material/slide-toggle/slide-toggle.e2e.spec.ts index fbae244ac4e2..175d4031ac4f 100644 --- a/src/material/slide-toggle/slide-toggle.e2e.spec.ts +++ b/src/material/slide-toggle/slide-toggle.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, element, by, Key} from 'protractor'; -import {expectToExist} from '../../e2e-app/test-util'; +import {expectToExist} from '@angular/cdk/testing/e2e'; describe('slide-toggle', () => { diff --git a/src/material/stepper/BUILD.bazel b/src/material/stepper/BUILD.bazel index 137ceeaac8e0..f3ad2680ea3b 100644 --- a/src/material/stepper/BUILD.bazel +++ b/src/material/stepper/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "stepper", @@ -70,15 +70,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -89,9 +85,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/stepper/stepper.e2e.spec.ts b/src/material/stepper/stepper.e2e.spec.ts index aedcca2877cb..d03f84e1c204 100644 --- a/src/material/stepper/stepper.e2e.spec.ts +++ b/src/material/stepper/stepper.e2e.spec.ts @@ -1,6 +1,6 @@ import {browser, by, element, ElementFinder, ExpectedConditions} from 'protractor'; import {Key} from 'selenium-webdriver'; -import {expectFocusOn, expectToExist, pressKeys} from '../../e2e-app/test-util'; +import {expectFocusOn, expectToExist, pressKeys} from '@angular/cdk/testing/e2e'; describe('stepper', () => { beforeEach(async () => await browser.get('/stepper')); diff --git a/src/material/tabs/BUILD.bazel b/src/material/tabs/BUILD.bazel index 646c96d86347..b2d96ddd0143 100644 --- a/src/material/tabs/BUILD.bazel +++ b/src/material/tabs/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "tabs", @@ -97,15 +97,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -116,9 +112,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/tabs/tabs.e2e.spec.ts b/src/material/tabs/tabs.e2e.spec.ts index ec7c093ca353..6fdba6c262f4 100644 --- a/src/material/tabs/tabs.e2e.spec.ts +++ b/src/material/tabs/tabs.e2e.spec.ts @@ -6,7 +6,7 @@ import { Key, ExpectedConditions } from 'protractor'; -import {pressKeys} from '../../e2e-app/test-util'; +import {pressKeys} from '@angular/cdk/testing/e2e'; describe('tabs', () => { describe('basic behavior', () => { diff --git a/src/material/toolbar/BUILD.bazel b/src/material/toolbar/BUILD.bazel index c2ca267e6fe5..16481cc6c4a3 100644 --- a/src/material/toolbar/BUILD.bazel +++ b/src/material/toolbar/BUILD.bazel @@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary") load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite") load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", - "markdown_to_html", "ts_library") + "markdown_to_html", "ng_e2e_test_library") ng_module( name = "toolbar", @@ -47,15 +47,11 @@ ng_web_test_suite( deps = [":unit_test_sources"], ) -ts_library( +ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), - tsconfig = "//src/e2e-app:tsconfig-e2e.json", deps = [ - "@npm//@types/jasmine", - "@npm//@types/selenium-webdriver", - "@npm//protractor", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ] ) @@ -66,9 +62,8 @@ protractor_web_test_suite( on_prepare = "//src/e2e-app:start-devserver.js", server = "//src/e2e-app:devserver", deps = [ - "@npm//protractor", ":e2e_test_sources", - "//src/e2e-app:e2e_utils_lib", + "//src/cdk/testing/e2e", ], data = [ "@npm//@angular/bazel", diff --git a/src/material/tsconfig-tests.json b/src/material/tsconfig-tests.json index 5d41e34fc59e..028df29b98e0 100644 --- a/src/material/tsconfig-tests.json +++ b/src/material/tsconfig-tests.json @@ -29,6 +29,7 @@ "index.ts" ], "exclude": [ - "**/schematics/**/*.ts" + "**/schematics/**/*.ts", + "**/*.e2e.spec.ts" ] } diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 523e5c1d10d2..1169832b82b2 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -98,6 +98,19 @@ def ng_test_library(deps = [], tsconfig = None, **kwargs): **kwargs ) +def ng_e2e_test_library(deps = [], tsconfig = None, **kwargs): + local_deps = [ + "@npm//@types/jasmine", + "@npm//@types/selenium-webdriver", + "@npm//protractor", + ] + deps; + + ts_library( + testonly = 1, + deps = local_deps, + **kwargs + ) + def ts_web_test_suite(deps = [], srcs = [], **kwargs): _ts_web_test_suite( deps = ["//tools/rxjs:rxjs_umd_modules"] + deps, From a39039106d36d390531142974397183861e9b954 Mon Sep 17 00:00:00 2001 From: Miles Malerba Date: Tue, 28 May 2019 14:12:12 -0700 Subject: [PATCH 7/7] fix lint --- src/cdk/testing/e2e/actions.ts | 8 ++++++++ src/cdk/testing/e2e/asserts.ts | 8 ++++++++ src/cdk/testing/e2e/index.ts | 8 ++++++++ src/cdk/testing/e2e/query.ts | 8 ++++++++ tools/package-tools/rollup-globals.ts | 2 ++ 5 files changed, 34 insertions(+) diff --git a/src/cdk/testing/e2e/actions.ts b/src/cdk/testing/e2e/actions.ts index 572c1c7b569d..1ea20af47a08 100644 --- a/src/cdk/testing/e2e/actions.ts +++ b/src/cdk/testing/e2e/actions.ts @@ -1,3 +1,11 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + import {browser} from 'protractor'; import {getElement, FinderResult} from './query'; diff --git a/src/cdk/testing/e2e/asserts.ts b/src/cdk/testing/e2e/asserts.ts index 3d20ae95d6e4..a26688dbff7f 100644 --- a/src/cdk/testing/e2e/asserts.ts +++ b/src/cdk/testing/e2e/asserts.ts @@ -1,3 +1,11 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + import {browser} from 'protractor'; import {getElement, FinderResult, waitForElement} from './query'; import {Point} from './actions'; diff --git a/src/cdk/testing/e2e/index.ts b/src/cdk/testing/e2e/index.ts index 2b076fee83a9..96909187f244 100644 --- a/src/cdk/testing/e2e/index.ts +++ b/src/cdk/testing/e2e/index.ts @@ -1,3 +1,11 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + export * from './actions'; export * from './asserts'; export * from './query'; diff --git a/src/cdk/testing/e2e/query.ts b/src/cdk/testing/e2e/query.ts index 364766922e08..2beea839b39d 100644 --- a/src/cdk/testing/e2e/query.ts +++ b/src/cdk/testing/e2e/query.ts @@ -1,3 +1,11 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + import {browser, by, element, ElementFinder} from 'protractor'; import {Point} from './actions'; diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts index a6444f1b79dc..4e349718b1ca 100644 --- a/tools/package-tools/rollup-globals.ts +++ b/tools/package-tools/rollup-globals.ts @@ -113,6 +113,8 @@ export const rollupGlobals = { ...rollupCdkExperimentalEntryPoints, ...rollupMaterialExperimentalEntryPoints, + '@angular/cdk/testing/e2e': 'ng.cdk.testing.e2e', + 'rxjs': 'rxjs', 'rxjs/operators': 'rxjs.operators', };