From 1449d0e25caf5c3cdf3b9eaa46c9f47dd3b6b9ee Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Thu, 18 Oct 2018 21:28:58 +0200 Subject: [PATCH 1/3] build: test material with bazel * Supports testing `src/lib` with Bazel. --- .circleci/config.yml | 4 ++-- src/lib/BUILD.bazel | 5 ++++- src/lib/autocomplete/BUILD.bazel | 29 ++++++++++++++++++++++++- src/lib/badge/BUILD.bazel | 18 +++++++++++++++- src/lib/bottom-sheet/BUILD.bazel | 25 ++++++++++++++++++++- src/lib/button-toggle/BUILD.bazel | 19 +++++++++++++++- src/lib/button/BUILD.bazel | 17 ++++++++++++++- src/lib/checkbox/BUILD.bazel | 19 +++++++++++++++- src/lib/chips/BUILD.bazel | 26 +++++++++++++++++++++- src/lib/core/BUILD.bazel | 24 +++++++++++++++++++-- src/lib/datepicker/BUILD.bazel | 31 ++++++++++++++++++++++++--- src/lib/datepicker/datepicker.spec.ts | 4 ++-- src/lib/dialog/BUILD.bazel | 25 ++++++++++++++++++++- src/lib/divider/BUILD.bazel | 18 +++++++++++++++- src/lib/expansion/BUILD.bazel | 20 ++++++++++++++++- src/lib/grid-list/BUILD.bazel | 18 +++++++++++++++- src/lib/icon/BUILD.bazel | 18 +++++++++++++++- src/lib/input/BUILD.bazel | 24 ++++++++++++++++++++- src/lib/input/input.spec.ts | 2 +- src/lib/list/BUILD.bazel | 21 ++++++++++++++++-- src/lib/menu/BUILD.bazel | 26 +++++++++++++++++++++- src/lib/paginator/BUILD.bazel | 19 ++++++++++++++-- src/lib/paginator/paginator.spec.ts | 2 +- src/lib/progress-bar/BUILD.bazel | 19 ++++++++++++++-- src/lib/progress-spinner/BUILD.bazel | 17 ++++++++++++++- src/lib/radio/BUILD.bazel | 18 +++++++++++++++- src/lib/select/BUILD.bazel | 29 ++++++++++++++++++++++++- src/lib/sidenav/BUILD.bazel | 23 +++++++++++++++++++- src/lib/slide-toggle/BUILD.bazel | 22 ++++++++++++++++++- src/lib/slider/BUILD.bazel | 20 ++++++++++++++++- src/lib/snack-bar/BUILD.bazel | 19 +++++++++++++++- src/lib/sort/BUILD.bazel | 23 +++++++++++++++++++- src/lib/stepper/BUILD.bazel | 26 +++++++++++++++++++++- src/lib/table/BUILD.bazel | 20 ++++++++++++++++- src/lib/tabs/BUILD.bazel | 26 +++++++++++++++++++++- src/lib/toolbar/BUILD.bazel | 19 +++++++++++++++- src/lib/tooltip/BUILD.bazel | 24 ++++++++++++++++++++- src/lib/tree/BUILD.bazel | 17 ++++++++++++++- tools/defaults.bzl | 14 +++++++++--- 39 files changed, 701 insertions(+), 49 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 28e7bc558ce0..4f5f067f17ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -83,8 +83,8 @@ jobs: - *copy_bazel_config # TODO(jelbourn): Update this command to run all tests if the Bazel issues have been fixed. - - run: bazel build src/cdk/... src/lib:material - - run: bazel test src/cdk/... + - run: bazel build src/cdk/... src/lib/... + - run: bazel test src/cdk/... src/lib/... - *save_cache diff --git a/src/lib/BUILD.bazel b/src/lib/BUILD.bazel index 21facf090f62..cde31c23d9d8 100644 --- a/src/lib/BUILD.bazel +++ b/src/lib/BUILD.bazel @@ -46,5 +46,8 @@ ng_package( packages = ["//src/lib/schematics:npm_package"], replacements = VERSION_PLACEHOLDER_REPLACEMENTS, deps = MATERIAL_TARGETS, - tags = ["publish"], + # TODO(devversion): Use the npm package for publishing. Right now this is disabled because + # we build using AOT for serving & testing, but the `ng_package` rule should not include factory + # files. + tags = ["manual"], ) diff --git a/src/lib/autocomplete/BUILD.bazel b/src/lib/autocomplete/BUILD.bazel index fab6fa9cf408..48fd755db133 100644 --- a/src/lib/autocomplete/BUILD.bazel +++ b/src/lib/autocomplete/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "autocomplete", @@ -42,3 +42,30 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "autocomplete_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "@rxjs", + "@rxjs//operators", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/overlay", + "//src/cdk/scrolling", + "//src/cdk/testing", + "//src/lib/core", + "//src/lib/form-field", + "//src/lib/input", + ":autocomplete" + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":autocomplete_test_sources"], + prebuilt_theme = True, +) diff --git a/src/lib/badge/BUILD.bazel b/src/lib/badge/BUILD.bazel index 6154a9eb7a10..1bfd1519b536 100644 --- a/src/lib/badge/BUILD.bazel +++ b/src/lib/badge/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "badge", @@ -26,3 +26,19 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "badge_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + "//src/lib/core", + ":badge", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":badge_test_sources"] +) + diff --git a/src/lib/bottom-sheet/BUILD.bazel b/src/lib/bottom-sheet/BUILD.bazel index c5a36397bad4..bdbaa2075489 100644 --- a/src/lib/bottom-sheet/BUILD.bazel +++ b/src/lib/bottom-sheet/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "bottom-sheet", @@ -42,3 +42,26 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "bottom_sheet_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/common", + "@angular//packages/common/testing", + "@angular//packages/platform-browser/animations", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/overlay", + "//src/cdk/scrolling", + "//src/cdk/testing", + ":bottom-sheet", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":bottom_sheet_test_sources"], + prebuilt_theme = True, +) + diff --git a/src/lib/button-toggle/BUILD.bazel b/src/lib/button-toggle/BUILD.bazel index f69996ac55d7..266cfdbadbd6 100644 --- a/src/lib/button-toggle/BUILD.bazel +++ b/src/lib/button-toggle/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "button-toggle", @@ -34,3 +34,20 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "button_toggle_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "//src/cdk/testing", + ":button-toggle", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":button_toggle_test_sources"] +) + diff --git a/src/lib/button/BUILD.bazel b/src/lib/button/BUILD.bazel index 8b33203e5cbf..8de8652d5f60 100644 --- a/src/lib/button/BUILD.bazel +++ b/src/lib/button/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "button", @@ -41,3 +41,18 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "button_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + "//src/lib/core", + ":button" + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":button_test_sources"] +) diff --git a/src/lib/checkbox/BUILD.bazel b/src/lib/checkbox/BUILD.bazel index a779a47b32d5..7f4afdc3ef06 100644 --- a/src/lib/checkbox/BUILD.bazel +++ b/src/lib/checkbox/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "checkbox", @@ -36,3 +36,20 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "checkbox_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "//src/cdk/observers", + "//src/cdk/testing", + ":checkbox", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":checkbox_test_sources"] +) diff --git a/src/lib/chips/BUILD.bazel b/src/lib/chips/BUILD.bazel index d41346956be7..11124f554e73 100644 --- a/src/lib/chips/BUILD.bazel +++ b/src/lib/chips/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "chips", @@ -40,3 +40,27 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "chips_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/animations", + "@angular//packages/forms", + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "//src/cdk/a11y", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/platform", + "//src/cdk/testing", + "//src/lib/form-field", + "//src/lib/input", + ":chips", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":chips_test_sources"] +) diff --git a/src/lib/core/BUILD.bazel b/src/lib/core/BUILD.bazel index 705ac7a32248..8aa52f0f9316 100644 --- a/src/lib/core/BUILD.bazel +++ b/src/lib/core/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") load("//:packages.bzl", "MATERIAL_PACKAGES") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") exports_files(["theming/_theming.scss"]) @@ -30,7 +30,6 @@ ng_module( ], ) - # TODO(jelbourn): remove this when sass_library acts like a filegroup filegroup( name = "core_scss_partials", @@ -106,3 +105,24 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +################# +# Test targets +################# + +ng_test_library( + name = "core_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "//src/cdk/platform", + "//src/cdk/testing", + "//src/lib/core", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":core_test_sources"] +) diff --git a/src/lib/datepicker/BUILD.bazel b/src/lib/datepicker/BUILD.bazel index bf844008f92b..1e860facc8e0 100644 --- a/src/lib/datepicker/BUILD.bazel +++ b/src/lib/datepicker/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "datepicker", @@ -64,9 +64,34 @@ sass_binary( deps = ["//src/lib/core:core_scss_lib"], ) - - sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "datepicker_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "@angular//packages/platform-browser-dynamic/testing", + "@angular//packages/platform-browser/animations", + "@rxjs", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/overlay", + "//src/cdk/scrolling", + "//src/cdk/testing", + "//src/lib/core", + "//src/lib/form-field", + "//src/lib/input", + ":datepicker", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":datepicker_test_sources"], + prebuilt_theme = True, +) diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts index 43bacefaf406..479b95a96ffa 100644 --- a/src/lib/datepicker/datepicker.spec.ts +++ b/src/lib/datepicker/datepicker.spec.ts @@ -604,7 +604,7 @@ describe('MatDatepicker', () => { // When the calendar is in year view, the first cell should be for a month rather than // for a date. - expect(firstCalendarCell.textContent) + expect(firstCalendarCell.textContent!.trim()) .toBe('JAN', 'Expected the calendar to be in year-view'); }); @@ -654,7 +654,7 @@ describe('MatDatepicker', () => { // When the calendar is in year view, the first cell should be for a month rather than // for a date. - expect(firstCalendarCell.textContent) + expect(firstCalendarCell.textContent!.trim()) .toBe('2016', 'Expected the calendar to be in multi-year-view'); }); diff --git a/src/lib/dialog/BUILD.bazel b/src/lib/dialog/BUILD.bazel index 728461be31cb..3a678940898b 100644 --- a/src/lib/dialog/BUILD.bazel +++ b/src/lib/dialog/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "dialog", @@ -39,3 +39,26 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "dialog_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/common", + "@angular//packages/common/testing", + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "@rxjs", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/overlay", + "//src/cdk/scrolling", + "//src/cdk/testing", + ":dialog", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":dialog_test_sources"] +) diff --git a/src/lib/divider/BUILD.bazel b/src/lib/divider/BUILD.bazel index f3ae1727f3d1..498a0200fd92 100644 --- a/src/lib/divider/BUILD.bazel +++ b/src/lib/divider/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "divider", @@ -39,3 +39,19 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + + +ng_test_library( + name = "divider_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + ":divider", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":divider_test_sources"] +) + diff --git a/src/lib/expansion/BUILD.bazel b/src/lib/expansion/BUILD.bazel index 3187a0823c56..d11009a5518b 100644 --- a/src/lib/expansion/BUILD.bazel +++ b/src/lib/expansion/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "expansion", @@ -49,3 +49,21 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "expansion_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "//src/cdk/a11y", + "//src/cdk/keycodes", + "//src/cdk/testing", + ":expansion", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":expansion_test_sources"] +) diff --git a/src/lib/grid-list/BUILD.bazel b/src/lib/grid-list/BUILD.bazel index 5cb498e0e41e..caec606a2852 100644 --- a/src/lib/grid-list/BUILD.bazel +++ b/src/lib/grid-list/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "grid-list", @@ -32,3 +32,19 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + + +ng_test_library( + name = "grid_list_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + "//src/cdk/bidi", + ":grid-list", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":grid_list_test_sources"] +) diff --git a/src/lib/icon/BUILD.bazel b/src/lib/icon/BUILD.bazel index 1a0e259474a2..11306a627e69 100644 --- a/src/lib/icon/BUILD.bazel +++ b/src/lib/icon/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "icon", @@ -36,3 +36,19 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "icon_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/common/http/testing", + "@angular//packages/platform-browser", + "//src/cdk/testing", + ":icon", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":icon_test_sources"] +) diff --git a/src/lib/input/BUILD.bazel b/src/lib/input/BUILD.bazel index 31356ab49f8f..1fded57ad35b 100644 --- a/src/lib/input/BUILD.bazel +++ b/src/lib/input/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "input", @@ -39,3 +39,25 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "input_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "//src/cdk/platform", + "//src/cdk/testing", + "//src/lib/core", + "//src/lib/form-field", + "//src/lib/stepper", + "//src/lib/tabs", + ":input", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":input_test_sources"] +) diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts index b00e3a147c12..5e5c272a4df5 100644 --- a/src/lib/input/input.spec.ts +++ b/src/lib/input/input.spec.ts @@ -404,7 +404,7 @@ describe('MatInput without forms', () => { const el = fixture.debugElement.query(By.css('label')); expect(el).not.toBeNull(); - expect(el.nativeElement.textContent).toMatch(/^hello$/); + expect(el.nativeElement.textContent!.trim()).toMatch(/^hello$/); }); it('should hide the required star from screen readers', fakeAsync(() => { diff --git a/src/lib/list/BUILD.bazel b/src/lib/list/BUILD.bazel index 176b1dd80cf7..ab6cb3433371 100644 --- a/src/lib/list/BUILD.bazel +++ b/src/lib/list/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "list", @@ -22,7 +22,6 @@ ng_module( ], ) - # TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup filegroup( name = "list_scss_partials", @@ -39,3 +38,21 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "list_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "//src/cdk/keycodes", + "//src/cdk/testing", + "//src/lib/core", + ":list", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":list_test_sources"] +) diff --git a/src/lib/menu/BUILD.bazel b/src/lib/menu/BUILD.bazel index 0dbeeda8f5e0..4ca53c426f94 100644 --- a/src/lib/menu/BUILD.bazel +++ b/src/lib/menu/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "menu", @@ -40,3 +40,27 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) +ng_test_library( + name = "menu_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "@rxjs", + "//src/cdk/a11y", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/overlay", + "//src/cdk/scrolling", + "//src/cdk/testing", + "//src/lib/core", + ":menu", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":menu_test_sources"], + prebuilt_theme = True, +) + diff --git a/src/lib/paginator/BUILD.bazel b/src/lib/paginator/BUILD.bazel index cf51adcb0261..f4cb9a8b0745 100644 --- a/src/lib/paginator/BUILD.bazel +++ b/src/lib/paginator/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "paginator", @@ -20,7 +20,6 @@ ng_module( ], ) - # TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup filegroup( name = "paginator_scss_partials", @@ -37,3 +36,19 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "paginator_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser/animations", + "//src/cdk/testing", + "//src/lib/core", + ":paginator", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":paginator_test_sources"], +) diff --git a/src/lib/paginator/paginator.spec.ts b/src/lib/paginator/paginator.spec.ts index c290748db418..d6dfe0e714db 100644 --- a/src/lib/paginator/paginator.spec.ts +++ b/src/lib/paginator/paginator.spec.ts @@ -101,7 +101,7 @@ describe('MatPaginator', () => { intl.changes.next(); fixture.detectChanges(); - expect(label.textContent).toBe('1337 items per page'); + expect(label.textContent!.trim()).toBe('1337 items per page'); })); }); diff --git a/src/lib/progress-bar/BUILD.bazel b/src/lib/progress-bar/BUILD.bazel index 934f0e73e067..69e0ab461565 100644 --- a/src/lib/progress-bar/BUILD.bazel +++ b/src/lib/progress-bar/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "progress-bar", @@ -18,7 +18,6 @@ ng_module( ], ) - # TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup filegroup( name = "progress_bar_scss_partials", @@ -35,3 +34,19 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "progress_bar_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "//src/cdk/testing", + ":progress-bar", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":progress_bar_test_sources"] +) diff --git a/src/lib/progress-spinner/BUILD.bazel b/src/lib/progress-spinner/BUILD.bazel index 796d57bd4215..9d51ba644f27 100644 --- a/src/lib/progress-spinner/BUILD.bazel +++ b/src/lib/progress-spinner/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "progress-spinner", @@ -34,3 +34,18 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) +ng_test_library( + name = "progress_spinner_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + ":progress-spinner", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":progress_spinner_test_sources"] +) + + diff --git a/src/lib/radio/BUILD.bazel b/src/lib/radio/BUILD.bazel index 1278e8c52128..c9bb984936fc 100644 --- a/src/lib/radio/BUILD.bazel +++ b/src/lib/radio/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "radio", @@ -36,3 +36,19 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "radio_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "//src/cdk/testing", + ":radio", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":radio_test_sources"] +) diff --git a/src/lib/select/BUILD.bazel b/src/lib/select/BUILD.bazel index 54dc3f330c26..27036a8791e7 100644 --- a/src/lib/select/BUILD.bazel +++ b/src/lib/select/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "select", @@ -43,3 +43,30 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "select_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "@rxjs", + "@rxjs//operators", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/overlay", + "//src/cdk/platform", + "//src/cdk/scrolling", + "//src/cdk/testing", + "//src/lib/core", + "//src/lib/form-field", + ":select", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":select_test_sources"], + prebuilt_theme = True, +) diff --git a/src/lib/sidenav/BUILD.bazel b/src/lib/sidenav/BUILD.bazel index 2fcb507c9715..2b1c8b8ecb65 100644 --- a/src/lib/sidenav/BUILD.bazel +++ b/src/lib/sidenav/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "sidenav", @@ -41,3 +41,24 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "sidenav_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "//src/cdk/a11y", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/platform", + "//src/cdk/scrolling", + "//src/cdk/testing", + ":sidenav", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":sidenav_test_sources"] +) diff --git a/src/lib/slide-toggle/BUILD.bazel b/src/lib/slide-toggle/BUILD.bazel index eb2033dad880..49eefb28734f 100644 --- a/src/lib/slide-toggle/BUILD.bazel +++ b/src/lib/slide-toggle/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "slide-toggle", @@ -38,3 +38,23 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "slide_toggle_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "//src/cdk/bidi", + "//src/cdk/observers", + "//src/cdk/testing", + # TODO(devversion): move gesture test config out of slider. + "//src/lib/slider", + ":slide-toggle", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":slide_toggle_test_sources"] +) diff --git a/src/lib/slider/BUILD.bazel b/src/lib/slider/BUILD.bazel index a17dab91ffb0..1402bf20178a 100644 --- a/src/lib/slider/BUILD.bazel +++ b/src/lib/slider/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "slider", @@ -39,3 +39,21 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "slider_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/testing", + ":slider", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":slider_test_sources"] +) diff --git a/src/lib/snack-bar/BUILD.bazel b/src/lib/snack-bar/BUILD.bazel index 1237680ecf6b..6176b32a2c09 100644 --- a/src/lib/snack-bar/BUILD.bazel +++ b/src/lib/snack-bar/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "snack-bar", @@ -49,3 +49,20 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "snack_bar_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/common", + "@angular//packages/platform-browser/animations", + "//src/cdk/a11y", + "//src/cdk/overlay", + ":snack-bar", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":snack_bar_test_sources"] +) diff --git a/src/lib/sort/BUILD.bazel b/src/lib/sort/BUILD.bazel index fd6b2eaff6ee..c68a88240294 100644 --- a/src/lib/sort/BUILD.bazel +++ b/src/lib/sort/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "sort", @@ -34,3 +34,24 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "sort_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "@rxjs", + "@rxjs//operators", + "//src/cdk/collections", + "//src/cdk/table", + "//src/cdk/testing", + "//src/lib/table", + ":sort", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":sort_test_sources"] +) diff --git a/src/lib/stepper/BUILD.bazel b/src/lib/stepper/BUILD.bazel index d778a8004bff..74614de346f2 100644 --- a/src/lib/stepper/BUILD.bazel +++ b/src/lib/stepper/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "stepper", @@ -51,3 +51,27 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "stepper_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/forms", + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "@rxjs", + "@rxjs//operators", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/stepper", + "//src/cdk/testing", + "//src/lib/form-field", + "//src/lib/input", + ":stepper", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":stepper_test_sources"] +) diff --git a/src/lib/table/BUILD.bazel b/src/lib/table/BUILD.bazel index fd37fbe32754..99b03fc89ce1 100644 --- a/src/lib/table/BUILD.bazel +++ b/src/lib/table/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "table", @@ -37,3 +37,21 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "table_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser/animations", + "@rxjs", + "//src/cdk/collections", + "//src/lib/paginator", + "//src/lib/sort", + ":table", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":table_test_sources"] +) diff --git a/src/lib/tabs/BUILD.bazel b/src/lib/tabs/BUILD.bazel index d147ec45e552..36fb15e9ae05 100644 --- a/src/lib/tabs/BUILD.bazel +++ b/src/lib/tabs/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "tabs", @@ -85,3 +85,27 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "tabs_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/common", + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "@rxjs", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/observers", + "//src/cdk/portal", + "//src/cdk/scrolling", + "//src/cdk/testing", + "//src/lib/core", + ":tabs", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":tabs_test_sources"] +) diff --git a/src/lib/toolbar/BUILD.bazel b/src/lib/toolbar/BUILD.bazel index 4b6e13a74f88..69c2ad73205e 100644 --- a/src/lib/toolbar/BUILD.bazel +++ b/src/lib/toolbar/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "toolbar", @@ -32,3 +32,20 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) +ng_test_library( + name = "toolbar_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/platform-browser", + ":toolbar", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":toolbar_test_sources"] +) + + + + diff --git a/src/lib/tooltip/BUILD.bazel b/src/lib/tooltip/BUILD.bazel index 8836245b156e..2e4c2d2b3594 100644 --- a/src/lib/tooltip/BUILD.bazel +++ b/src/lib/tooltip/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "tooltip", @@ -44,3 +44,25 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "tooltip_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@angular//packages/animations", + "@angular//packages/platform-browser", + "@angular//packages/platform-browser/animations", + "//src/cdk/a11y", + "//src/cdk/bidi", + "//src/cdk/keycodes", + "//src/cdk/overlay", + "//src/cdk/platform", + "//src/cdk/testing", + ":tooltip", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":tooltip_test_sources"] +) diff --git a/src/lib/tree/BUILD.bazel b/src/lib/tree/BUILD.bazel index 03c509c69994..80075e72b3b1 100644 --- a/src/lib/tree/BUILD.bazel +++ b/src/lib/tree/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility=["//visibility:public"]) load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library", "sass_binary") -load("//tools:defaults.bzl", "ng_module") +load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite") ng_module( name = "tree", @@ -35,3 +35,18 @@ sass_library( name = "theme", srcs = glob(["**/*-theme.scss"]), ) + +ng_test_library( + name = "tree_test_sources", + srcs = glob(["**/*.spec.ts"]), + deps = [ + "@rxjs", + "//src/cdk/tree", + ":tree", + ] +) + +ng_web_test_suite( + name = "unit_tests", + deps = [":tree_test_sources"] +) diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 27165ff33a5b..cada8e9cfa80 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -72,7 +72,14 @@ def ng_test_library(deps = [], tsconfig = None, **kwargs): **kwargs ) -def ng_web_test_suite(deps = [], srcs = [], static_css = [], **kwargs): +def ng_web_test_suite(deps = [], srcs = [], static_css = [], prebuilt_theme = False, + bootstrap = [], **kwargs): + + # We add a option for including a prebuilt theme in the test suite because otherwise there + # will be a lot of code duplication and it just requires more work to setup a test suite. + if prebuilt_theme: + static_css = static_css + ["//src/lib/prebuilt-themes:indigo-pink"] + # Workaround for https://github.com/bazelbuild/rules_typescript/issues/301 # Since some of our tests depend on CSS files which are not part of the `ng_module` rule, # we need to somehow load static CSS files within Karma (e.g. overlay prebuilt). Those styles @@ -80,7 +87,7 @@ def ng_web_test_suite(deps = [], srcs = [], static_css = [], **kwargs): # allows JS files to be included and served within Karma, we need to create a JS file that # loads the given CSS file. for css_label in static_css: - css_id = "static-css-file-%s" % (css_label.strip(':').strip('/')) + css_id = "static-css-file-%s" % (css_label.replace("/", "_").replace(":", "-")) deps += [":%s" % css_id] native.genrule( @@ -108,6 +115,7 @@ def ng_web_test_suite(deps = [], srcs = [], static_css = [], **kwargs): bootstrap = [ "@npm//node_modules/zone.js:dist/zone-testing-bundle.js", "@npm//node_modules/reflect-metadata:Reflect.js", - ], + "@npm//node_modules/hammerjs:hammer.js", + ] + bootstrap, **kwargs ) From a21b9e3815f118e7023550e10ca6fdb67e59e3cb Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 22 Oct 2018 19:42:27 +0200 Subject: [PATCH 2/3] Add prebuilt theme to all Material tests --- src/lib/badge/BUILD.bazel | 3 ++- src/lib/button-toggle/BUILD.bazel | 3 ++- src/lib/button/BUILD.bazel | 3 ++- src/lib/checkbox/BUILD.bazel | 3 ++- src/lib/chips/BUILD.bazel | 3 ++- src/lib/core/BUILD.bazel | 3 ++- src/lib/dialog/BUILD.bazel | 3 ++- src/lib/divider/BUILD.bazel | 3 ++- src/lib/expansion/BUILD.bazel | 3 ++- src/lib/grid-list/BUILD.bazel | 3 ++- src/lib/icon/BUILD.bazel | 3 ++- src/lib/input/BUILD.bazel | 3 ++- src/lib/list/BUILD.bazel | 3 ++- src/lib/paginator/BUILD.bazel | 1 + src/lib/progress-bar/BUILD.bazel | 3 ++- src/lib/progress-spinner/BUILD.bazel | 3 ++- src/lib/radio/BUILD.bazel | 3 ++- src/lib/sidenav/BUILD.bazel | 3 ++- src/lib/slide-toggle/BUILD.bazel | 3 ++- src/lib/slider/BUILD.bazel | 3 ++- src/lib/snack-bar/BUILD.bazel | 3 ++- src/lib/sort/BUILD.bazel | 3 ++- src/lib/stepper/BUILD.bazel | 3 ++- src/lib/table/BUILD.bazel | 3 ++- src/lib/tabs/BUILD.bazel | 3 ++- src/lib/toolbar/BUILD.bazel | 3 ++- src/lib/tooltip/BUILD.bazel | 3 ++- src/lib/tree/BUILD.bazel | 3 ++- 28 files changed, 55 insertions(+), 27 deletions(-) diff --git a/src/lib/badge/BUILD.bazel b/src/lib/badge/BUILD.bazel index 1bfd1519b536..cb4e67ba282e 100644 --- a/src/lib/badge/BUILD.bazel +++ b/src/lib/badge/BUILD.bazel @@ -39,6 +39,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":badge_test_sources"] + deps = [":badge_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/button-toggle/BUILD.bazel b/src/lib/button-toggle/BUILD.bazel index 266cfdbadbd6..6af579baa9a9 100644 --- a/src/lib/button-toggle/BUILD.bazel +++ b/src/lib/button-toggle/BUILD.bazel @@ -48,6 +48,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":button_toggle_test_sources"] + deps = [":button_toggle_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/button/BUILD.bazel b/src/lib/button/BUILD.bazel index 8de8652d5f60..a3f837e1034c 100644 --- a/src/lib/button/BUILD.bazel +++ b/src/lib/button/BUILD.bazel @@ -54,5 +54,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":button_test_sources"] + deps = [":button_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/checkbox/BUILD.bazel b/src/lib/checkbox/BUILD.bazel index 7f4afdc3ef06..9289a1ca8c10 100644 --- a/src/lib/checkbox/BUILD.bazel +++ b/src/lib/checkbox/BUILD.bazel @@ -51,5 +51,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":checkbox_test_sources"] + deps = [":checkbox_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/chips/BUILD.bazel b/src/lib/chips/BUILD.bazel index 11124f554e73..0346a40cb000 100644 --- a/src/lib/chips/BUILD.bazel +++ b/src/lib/chips/BUILD.bazel @@ -62,5 +62,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":chips_test_sources"] + deps = [":chips_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/core/BUILD.bazel b/src/lib/core/BUILD.bazel index 8aa52f0f9316..a87314e2ae06 100644 --- a/src/lib/core/BUILD.bazel +++ b/src/lib/core/BUILD.bazel @@ -124,5 +124,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":core_test_sources"] + deps = [":core_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/dialog/BUILD.bazel b/src/lib/dialog/BUILD.bazel index 3a678940898b..5859e7d9dc33 100644 --- a/src/lib/dialog/BUILD.bazel +++ b/src/lib/dialog/BUILD.bazel @@ -60,5 +60,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":dialog_test_sources"] + deps = [":dialog_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/divider/BUILD.bazel b/src/lib/divider/BUILD.bazel index 498a0200fd92..78a3869f7147 100644 --- a/src/lib/divider/BUILD.bazel +++ b/src/lib/divider/BUILD.bazel @@ -52,6 +52,7 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":divider_test_sources"] + deps = [":divider_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/expansion/BUILD.bazel b/src/lib/expansion/BUILD.bazel index d11009a5518b..ef09b6468aaa 100644 --- a/src/lib/expansion/BUILD.bazel +++ b/src/lib/expansion/BUILD.bazel @@ -65,5 +65,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":expansion_test_sources"] + deps = [":expansion_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/grid-list/BUILD.bazel b/src/lib/grid-list/BUILD.bazel index caec606a2852..b102dac2deb9 100644 --- a/src/lib/grid-list/BUILD.bazel +++ b/src/lib/grid-list/BUILD.bazel @@ -46,5 +46,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":grid_list_test_sources"] + deps = [":grid_list_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/icon/BUILD.bazel b/src/lib/icon/BUILD.bazel index 11306a627e69..4aa8454ac717 100644 --- a/src/lib/icon/BUILD.bazel +++ b/src/lib/icon/BUILD.bazel @@ -50,5 +50,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":icon_test_sources"] + deps = [":icon_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/input/BUILD.bazel b/src/lib/input/BUILD.bazel index 1fded57ad35b..14b148cefd6a 100644 --- a/src/lib/input/BUILD.bazel +++ b/src/lib/input/BUILD.bazel @@ -59,5 +59,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":input_test_sources"] + deps = [":input_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/list/BUILD.bazel b/src/lib/list/BUILD.bazel index ab6cb3433371..f716c072f00f 100644 --- a/src/lib/list/BUILD.bazel +++ b/src/lib/list/BUILD.bazel @@ -54,5 +54,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":list_test_sources"] + deps = [":list_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/paginator/BUILD.bazel b/src/lib/paginator/BUILD.bazel index f4cb9a8b0745..3634d8396073 100644 --- a/src/lib/paginator/BUILD.bazel +++ b/src/lib/paginator/BUILD.bazel @@ -51,4 +51,5 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":paginator_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/progress-bar/BUILD.bazel b/src/lib/progress-bar/BUILD.bazel index 69e0ab461565..90797eefe129 100644 --- a/src/lib/progress-bar/BUILD.bazel +++ b/src/lib/progress-bar/BUILD.bazel @@ -48,5 +48,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":progress_bar_test_sources"] + deps = [":progress_bar_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/progress-spinner/BUILD.bazel b/src/lib/progress-spinner/BUILD.bazel index 9d51ba644f27..3210ea8a3b37 100644 --- a/src/lib/progress-spinner/BUILD.bazel +++ b/src/lib/progress-spinner/BUILD.bazel @@ -45,7 +45,8 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":progress_spinner_test_sources"] + deps = [":progress_spinner_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/radio/BUILD.bazel b/src/lib/radio/BUILD.bazel index c9bb984936fc..96aac01afcf6 100644 --- a/src/lib/radio/BUILD.bazel +++ b/src/lib/radio/BUILD.bazel @@ -50,5 +50,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":radio_test_sources"] + deps = [":radio_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/sidenav/BUILD.bazel b/src/lib/sidenav/BUILD.bazel index 2b1c8b8ecb65..95fc644f0ef0 100644 --- a/src/lib/sidenav/BUILD.bazel +++ b/src/lib/sidenav/BUILD.bazel @@ -60,5 +60,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":sidenav_test_sources"] + deps = [":sidenav_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/slide-toggle/BUILD.bazel b/src/lib/slide-toggle/BUILD.bazel index 49eefb28734f..5dfa4dd1d62c 100644 --- a/src/lib/slide-toggle/BUILD.bazel +++ b/src/lib/slide-toggle/BUILD.bazel @@ -56,5 +56,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":slide_toggle_test_sources"] + deps = [":slide_toggle_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/slider/BUILD.bazel b/src/lib/slider/BUILD.bazel index 1402bf20178a..5588c123e503 100644 --- a/src/lib/slider/BUILD.bazel +++ b/src/lib/slider/BUILD.bazel @@ -55,5 +55,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":slider_test_sources"] + deps = [":slider_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/snack-bar/BUILD.bazel b/src/lib/snack-bar/BUILD.bazel index 6176b32a2c09..c9616ebf2101 100644 --- a/src/lib/snack-bar/BUILD.bazel +++ b/src/lib/snack-bar/BUILD.bazel @@ -64,5 +64,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":snack_bar_test_sources"] + deps = [":snack_bar_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/sort/BUILD.bazel b/src/lib/sort/BUILD.bazel index c68a88240294..fc6f2bb31720 100644 --- a/src/lib/sort/BUILD.bazel +++ b/src/lib/sort/BUILD.bazel @@ -53,5 +53,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":sort_test_sources"] + deps = [":sort_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/stepper/BUILD.bazel b/src/lib/stepper/BUILD.bazel index 74614de346f2..fe8a4703daa2 100644 --- a/src/lib/stepper/BUILD.bazel +++ b/src/lib/stepper/BUILD.bazel @@ -73,5 +73,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":stepper_test_sources"] + deps = [":stepper_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/table/BUILD.bazel b/src/lib/table/BUILD.bazel index 99b03fc89ce1..e4ca6883c553 100644 --- a/src/lib/table/BUILD.bazel +++ b/src/lib/table/BUILD.bazel @@ -53,5 +53,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":table_test_sources"] + deps = [":table_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/tabs/BUILD.bazel b/src/lib/tabs/BUILD.bazel index 36fb15e9ae05..f92ec0f2b8ed 100644 --- a/src/lib/tabs/BUILD.bazel +++ b/src/lib/tabs/BUILD.bazel @@ -107,5 +107,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":tabs_test_sources"] + deps = [":tabs_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/toolbar/BUILD.bazel b/src/lib/toolbar/BUILD.bazel index 69c2ad73205e..2e244ba5c6ee 100644 --- a/src/lib/toolbar/BUILD.bazel +++ b/src/lib/toolbar/BUILD.bazel @@ -43,7 +43,8 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":toolbar_test_sources"] + deps = [":toolbar_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/tooltip/BUILD.bazel b/src/lib/tooltip/BUILD.bazel index 2e4c2d2b3594..f88a8805136d 100644 --- a/src/lib/tooltip/BUILD.bazel +++ b/src/lib/tooltip/BUILD.bazel @@ -64,5 +64,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":tooltip_test_sources"] + deps = [":tooltip_test_sources"], + prebuilt_theme = True, ) diff --git a/src/lib/tree/BUILD.bazel b/src/lib/tree/BUILD.bazel index 80075e72b3b1..1b52a2a675fd 100644 --- a/src/lib/tree/BUILD.bazel +++ b/src/lib/tree/BUILD.bazel @@ -48,5 +48,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", - deps = [":tree_test_sources"] + deps = [":tree_test_sources"], + prebuilt_theme = True, ) From 1d9c58fe672f267387eaf63849726094cbf6cbe1 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Wed, 24 Oct 2018 16:50:58 +0200 Subject: [PATCH 3/3] Always include prebuilt theme. Rebase changes for paginator spec --- src/lib/autocomplete/BUILD.bazel | 1 - src/lib/badge/BUILD.bazel | 1 - src/lib/bottom-sheet/BUILD.bazel | 1 - src/lib/button-toggle/BUILD.bazel | 1 - src/lib/button/BUILD.bazel | 1 - src/lib/checkbox/BUILD.bazel | 1 - src/lib/chips/BUILD.bazel | 1 - src/lib/core/BUILD.bazel | 1 - src/lib/datepicker/BUILD.bazel | 1 - src/lib/dialog/BUILD.bazel | 1 - src/lib/divider/BUILD.bazel | 1 - src/lib/expansion/BUILD.bazel | 1 - src/lib/grid-list/BUILD.bazel | 1 - src/lib/icon/BUILD.bazel | 1 - src/lib/input/BUILD.bazel | 1 - src/lib/list/BUILD.bazel | 1 - src/lib/menu/BUILD.bazel | 1 - src/lib/paginator/BUILD.bazel | 3 ++- src/lib/progress-bar/BUILD.bazel | 1 - src/lib/progress-spinner/BUILD.bazel | 1 - src/lib/radio/BUILD.bazel | 1 - src/lib/select/BUILD.bazel | 1 - src/lib/sidenav/BUILD.bazel | 1 - src/lib/slide-toggle/BUILD.bazel | 1 - src/lib/slider/BUILD.bazel | 1 - src/lib/snack-bar/BUILD.bazel | 1 - src/lib/sort/BUILD.bazel | 1 - src/lib/stepper/BUILD.bazel | 1 - src/lib/table/BUILD.bazel | 1 - src/lib/tabs/BUILD.bazel | 1 - src/lib/toolbar/BUILD.bazel | 1 - src/lib/tooltip/BUILD.bazel | 1 - src/lib/tree/BUILD.bazel | 1 - tools/defaults.bzl | 13 ++++++------- 34 files changed, 8 insertions(+), 40 deletions(-) diff --git a/src/lib/autocomplete/BUILD.bazel b/src/lib/autocomplete/BUILD.bazel index 48fd755db133..b8f84fbedc15 100644 --- a/src/lib/autocomplete/BUILD.bazel +++ b/src/lib/autocomplete/BUILD.bazel @@ -67,5 +67,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":autocomplete_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/badge/BUILD.bazel b/src/lib/badge/BUILD.bazel index cb4e67ba282e..314f6618bef8 100644 --- a/src/lib/badge/BUILD.bazel +++ b/src/lib/badge/BUILD.bazel @@ -40,6 +40,5 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":badge_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/bottom-sheet/BUILD.bazel b/src/lib/bottom-sheet/BUILD.bazel index bdbaa2075489..ec73fd8e67fa 100644 --- a/src/lib/bottom-sheet/BUILD.bazel +++ b/src/lib/bottom-sheet/BUILD.bazel @@ -62,6 +62,5 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":bottom_sheet_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/button-toggle/BUILD.bazel b/src/lib/button-toggle/BUILD.bazel index 6af579baa9a9..485cdeba84ce 100644 --- a/src/lib/button-toggle/BUILD.bazel +++ b/src/lib/button-toggle/BUILD.bazel @@ -49,6 +49,5 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":button_toggle_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/button/BUILD.bazel b/src/lib/button/BUILD.bazel index a3f837e1034c..2b51c893d724 100644 --- a/src/lib/button/BUILD.bazel +++ b/src/lib/button/BUILD.bazel @@ -55,5 +55,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":button_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/checkbox/BUILD.bazel b/src/lib/checkbox/BUILD.bazel index 9289a1ca8c10..556966262736 100644 --- a/src/lib/checkbox/BUILD.bazel +++ b/src/lib/checkbox/BUILD.bazel @@ -52,5 +52,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":checkbox_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/chips/BUILD.bazel b/src/lib/chips/BUILD.bazel index 0346a40cb000..fffc557280e3 100644 --- a/src/lib/chips/BUILD.bazel +++ b/src/lib/chips/BUILD.bazel @@ -63,5 +63,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":chips_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/core/BUILD.bazel b/src/lib/core/BUILD.bazel index a87314e2ae06..26055099b457 100644 --- a/src/lib/core/BUILD.bazel +++ b/src/lib/core/BUILD.bazel @@ -125,5 +125,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":core_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/datepicker/BUILD.bazel b/src/lib/datepicker/BUILD.bazel index 1e860facc8e0..015e2225753b 100644 --- a/src/lib/datepicker/BUILD.bazel +++ b/src/lib/datepicker/BUILD.bazel @@ -93,5 +93,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":datepicker_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/dialog/BUILD.bazel b/src/lib/dialog/BUILD.bazel index 5859e7d9dc33..aee0ad3ae4ee 100644 --- a/src/lib/dialog/BUILD.bazel +++ b/src/lib/dialog/BUILD.bazel @@ -61,5 +61,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":dialog_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/divider/BUILD.bazel b/src/lib/divider/BUILD.bazel index 78a3869f7147..b8c6b7aedac3 100644 --- a/src/lib/divider/BUILD.bazel +++ b/src/lib/divider/BUILD.bazel @@ -53,6 +53,5 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":divider_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/expansion/BUILD.bazel b/src/lib/expansion/BUILD.bazel index ef09b6468aaa..e0df56a61c5a 100644 --- a/src/lib/expansion/BUILD.bazel +++ b/src/lib/expansion/BUILD.bazel @@ -66,5 +66,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":expansion_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/grid-list/BUILD.bazel b/src/lib/grid-list/BUILD.bazel index b102dac2deb9..2bbc2aa3c3dd 100644 --- a/src/lib/grid-list/BUILD.bazel +++ b/src/lib/grid-list/BUILD.bazel @@ -47,5 +47,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":grid_list_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/icon/BUILD.bazel b/src/lib/icon/BUILD.bazel index 4aa8454ac717..b47014a1f87a 100644 --- a/src/lib/icon/BUILD.bazel +++ b/src/lib/icon/BUILD.bazel @@ -51,5 +51,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":icon_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/input/BUILD.bazel b/src/lib/input/BUILD.bazel index 14b148cefd6a..f181ced60cbf 100644 --- a/src/lib/input/BUILD.bazel +++ b/src/lib/input/BUILD.bazel @@ -60,5 +60,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":input_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/list/BUILD.bazel b/src/lib/list/BUILD.bazel index f716c072f00f..2c9caace63dc 100644 --- a/src/lib/list/BUILD.bazel +++ b/src/lib/list/BUILD.bazel @@ -55,5 +55,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":list_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/menu/BUILD.bazel b/src/lib/menu/BUILD.bazel index 4ca53c426f94..e571858689d5 100644 --- a/src/lib/menu/BUILD.bazel +++ b/src/lib/menu/BUILD.bazel @@ -61,6 +61,5 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":menu_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/paginator/BUILD.bazel b/src/lib/paginator/BUILD.bazel index 3634d8396073..175ab9fbb47d 100644 --- a/src/lib/paginator/BUILD.bazel +++ b/src/lib/paginator/BUILD.bazel @@ -41,9 +41,11 @@ ng_test_library( name = "paginator_test_sources", srcs = glob(["**/*.spec.ts"]), deps = [ + "@angular//packages/platform-browser", "@angular//packages/platform-browser/animations", "//src/cdk/testing", "//src/lib/core", + "//src/lib/select", ":paginator", ] ) @@ -51,5 +53,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":paginator_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/progress-bar/BUILD.bazel b/src/lib/progress-bar/BUILD.bazel index 90797eefe129..ebe444eb6fdd 100644 --- a/src/lib/progress-bar/BUILD.bazel +++ b/src/lib/progress-bar/BUILD.bazel @@ -49,5 +49,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":progress_bar_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/progress-spinner/BUILD.bazel b/src/lib/progress-spinner/BUILD.bazel index 3210ea8a3b37..629fdc7e7955 100644 --- a/src/lib/progress-spinner/BUILD.bazel +++ b/src/lib/progress-spinner/BUILD.bazel @@ -46,7 +46,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":progress_spinner_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/radio/BUILD.bazel b/src/lib/radio/BUILD.bazel index 96aac01afcf6..60210528b7f0 100644 --- a/src/lib/radio/BUILD.bazel +++ b/src/lib/radio/BUILD.bazel @@ -51,5 +51,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":radio_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/select/BUILD.bazel b/src/lib/select/BUILD.bazel index 27036a8791e7..f57a55068e05 100644 --- a/src/lib/select/BUILD.bazel +++ b/src/lib/select/BUILD.bazel @@ -68,5 +68,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":select_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/sidenav/BUILD.bazel b/src/lib/sidenav/BUILD.bazel index 95fc644f0ef0..90a793518775 100644 --- a/src/lib/sidenav/BUILD.bazel +++ b/src/lib/sidenav/BUILD.bazel @@ -61,5 +61,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":sidenav_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/slide-toggle/BUILD.bazel b/src/lib/slide-toggle/BUILD.bazel index 5dfa4dd1d62c..d347024d76cf 100644 --- a/src/lib/slide-toggle/BUILD.bazel +++ b/src/lib/slide-toggle/BUILD.bazel @@ -57,5 +57,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":slide_toggle_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/slider/BUILD.bazel b/src/lib/slider/BUILD.bazel index 5588c123e503..a700b69b3c69 100644 --- a/src/lib/slider/BUILD.bazel +++ b/src/lib/slider/BUILD.bazel @@ -56,5 +56,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":slider_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/snack-bar/BUILD.bazel b/src/lib/snack-bar/BUILD.bazel index c9616ebf2101..665026e0b9b2 100644 --- a/src/lib/snack-bar/BUILD.bazel +++ b/src/lib/snack-bar/BUILD.bazel @@ -65,5 +65,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":snack_bar_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/sort/BUILD.bazel b/src/lib/sort/BUILD.bazel index fc6f2bb31720..4a2075d11bb5 100644 --- a/src/lib/sort/BUILD.bazel +++ b/src/lib/sort/BUILD.bazel @@ -54,5 +54,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":sort_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/stepper/BUILD.bazel b/src/lib/stepper/BUILD.bazel index fe8a4703daa2..e0bfe4c5813e 100644 --- a/src/lib/stepper/BUILD.bazel +++ b/src/lib/stepper/BUILD.bazel @@ -74,5 +74,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":stepper_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/table/BUILD.bazel b/src/lib/table/BUILD.bazel index e4ca6883c553..e1019ae463e4 100644 --- a/src/lib/table/BUILD.bazel +++ b/src/lib/table/BUILD.bazel @@ -54,5 +54,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":table_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/tabs/BUILD.bazel b/src/lib/tabs/BUILD.bazel index f92ec0f2b8ed..39dbe672707d 100644 --- a/src/lib/tabs/BUILD.bazel +++ b/src/lib/tabs/BUILD.bazel @@ -108,5 +108,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":tabs_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/toolbar/BUILD.bazel b/src/lib/toolbar/BUILD.bazel index 2e244ba5c6ee..11f78183231c 100644 --- a/src/lib/toolbar/BUILD.bazel +++ b/src/lib/toolbar/BUILD.bazel @@ -44,7 +44,6 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":toolbar_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/tooltip/BUILD.bazel b/src/lib/tooltip/BUILD.bazel index f88a8805136d..fc9f03f50426 100644 --- a/src/lib/tooltip/BUILD.bazel +++ b/src/lib/tooltip/BUILD.bazel @@ -65,5 +65,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":tooltip_test_sources"], - prebuilt_theme = True, ) diff --git a/src/lib/tree/BUILD.bazel b/src/lib/tree/BUILD.bazel index 1b52a2a675fd..243e71797b9d 100644 --- a/src/lib/tree/BUILD.bazel +++ b/src/lib/tree/BUILD.bazel @@ -49,5 +49,4 @@ ng_test_library( ng_web_test_suite( name = "unit_tests", deps = [":tree_test_sources"], - prebuilt_theme = True, ) diff --git a/tools/defaults.bzl b/tools/defaults.bzl index cada8e9cfa80..ebeb290b580b 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -72,13 +72,12 @@ def ng_test_library(deps = [], tsconfig = None, **kwargs): **kwargs ) -def ng_web_test_suite(deps = [], srcs = [], static_css = [], prebuilt_theme = False, - bootstrap = [], **kwargs): - - # We add a option for including a prebuilt theme in the test suite because otherwise there - # will be a lot of code duplication and it just requires more work to setup a test suite. - if prebuilt_theme: - static_css = static_css + ["//src/lib/prebuilt-themes:indigo-pink"] +def ng_web_test_suite(deps = [], srcs = [], static_css = [], bootstrap = [], **kwargs): + # Always include a prebuilt theme in the test suite because otherwise tests, which depend on CSS + # that is needed for measuring, will unexpectedly fail. Also always adding a prebuilt theme + # reduces the amount of setup that is needed to create a test suite Bazel target. Note that the + # prebuilt theme will be also added to CDK test suites but shouldn't affect anything. + static_css = static_css + ["//src/lib/prebuilt-themes:indigo-pink"] # Workaround for https://github.com/bazelbuild/rules_typescript/issues/301 # Since some of our tests depend on CSS files which are not part of the `ng_module` rule,