Skip to content

Commit 1d9c58f

Browse files
committed
Always include prebuilt theme. Rebase changes for paginator spec
1 parent a21b9e3 commit 1d9c58f

File tree

34 files changed

+8
-40
lines changed

34 files changed

+8
-40
lines changed

src/lib/autocomplete/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,4 @@ ng_test_library(
6767
ng_web_test_suite(
6868
name = "unit_tests",
6969
deps = [":autocomplete_test_sources"],
70-
prebuilt_theme = True,
7170
)

src/lib/badge/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,5 @@ ng_test_library(
4040
ng_web_test_suite(
4141
name = "unit_tests",
4242
deps = [":badge_test_sources"],
43-
prebuilt_theme = True,
4443
)
4544

src/lib/bottom-sheet/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,5 @@ ng_test_library(
6262
ng_web_test_suite(
6363
name = "unit_tests",
6464
deps = [":bottom_sheet_test_sources"],
65-
prebuilt_theme = True,
6665
)
6766

src/lib/button-toggle/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,5 @@ ng_test_library(
4949
ng_web_test_suite(
5050
name = "unit_tests",
5151
deps = [":button_toggle_test_sources"],
52-
prebuilt_theme = True,
5352
)
5453

src/lib/button/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,4 @@ ng_test_library(
5555
ng_web_test_suite(
5656
name = "unit_tests",
5757
deps = [":button_test_sources"],
58-
prebuilt_theme = True,
5958
)

src/lib/checkbox/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,4 @@ ng_test_library(
5252
ng_web_test_suite(
5353
name = "unit_tests",
5454
deps = [":checkbox_test_sources"],
55-
prebuilt_theme = True,
5655
)

src/lib/chips/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,4 @@ ng_test_library(
6363
ng_web_test_suite(
6464
name = "unit_tests",
6565
deps = [":chips_test_sources"],
66-
prebuilt_theme = True,
6766
)

src/lib/core/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,4 @@ ng_test_library(
125125
ng_web_test_suite(
126126
name = "unit_tests",
127127
deps = [":core_test_sources"],
128-
prebuilt_theme = True,
129128
)

src/lib/datepicker/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,4 @@ ng_test_library(
9393
ng_web_test_suite(
9494
name = "unit_tests",
9595
deps = [":datepicker_test_sources"],
96-
prebuilt_theme = True,
9796
)

src/lib/dialog/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,4 @@ ng_test_library(
6161
ng_web_test_suite(
6262
name = "unit_tests",
6363
deps = [":dialog_test_sources"],
64-
prebuilt_theme = True,
6564
)

src/lib/divider/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,5 @@ ng_test_library(
5353
ng_web_test_suite(
5454
name = "unit_tests",
5555
deps = [":divider_test_sources"],
56-
prebuilt_theme = True,
5756
)
5857

src/lib/expansion/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,4 @@ ng_test_library(
6666
ng_web_test_suite(
6767
name = "unit_tests",
6868
deps = [":expansion_test_sources"],
69-
prebuilt_theme = True,
7069
)

src/lib/grid-list/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,4 @@ ng_test_library(
4747
ng_web_test_suite(
4848
name = "unit_tests",
4949
deps = [":grid_list_test_sources"],
50-
prebuilt_theme = True,
5150
)

src/lib/icon/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,4 @@ ng_test_library(
5151
ng_web_test_suite(
5252
name = "unit_tests",
5353
deps = [":icon_test_sources"],
54-
prebuilt_theme = True,
5554
)

src/lib/input/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,4 @@ ng_test_library(
6060
ng_web_test_suite(
6161
name = "unit_tests",
6262
deps = [":input_test_sources"],
63-
prebuilt_theme = True,
6463
)

src/lib/list/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,4 @@ ng_test_library(
5555
ng_web_test_suite(
5656
name = "unit_tests",
5757
deps = [":list_test_sources"],
58-
prebuilt_theme = True,
5958
)

src/lib/menu/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,5 @@ ng_test_library(
6161
ng_web_test_suite(
6262
name = "unit_tests",
6363
deps = [":menu_test_sources"],
64-
prebuilt_theme = True,
6564
)
6665

src/lib/paginator/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,16 @@ ng_test_library(
4141
name = "paginator_test_sources",
4242
srcs = glob(["**/*.spec.ts"]),
4343
deps = [
44+
"@angular//packages/platform-browser",
4445
"@angular//packages/platform-browser/animations",
4546
"//src/cdk/testing",
4647
"//src/lib/core",
48+
"//src/lib/select",
4749
":paginator",
4850
]
4951
)
5052

5153
ng_web_test_suite(
5254
name = "unit_tests",
5355
deps = [":paginator_test_sources"],
54-
prebuilt_theme = True,
5556
)

src/lib/progress-bar/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,4 @@ ng_test_library(
4949
ng_web_test_suite(
5050
name = "unit_tests",
5151
deps = [":progress_bar_test_sources"],
52-
prebuilt_theme = True,
5352
)

src/lib/progress-spinner/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ ng_test_library(
4646
ng_web_test_suite(
4747
name = "unit_tests",
4848
deps = [":progress_spinner_test_sources"],
49-
prebuilt_theme = True,
5049
)
5150

5251

src/lib/radio/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,4 @@ ng_test_library(
5151
ng_web_test_suite(
5252
name = "unit_tests",
5353
deps = [":radio_test_sources"],
54-
prebuilt_theme = True,
5554
)

src/lib/select/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,4 @@ ng_test_library(
6868
ng_web_test_suite(
6969
name = "unit_tests",
7070
deps = [":select_test_sources"],
71-
prebuilt_theme = True,
7271
)

src/lib/sidenav/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,4 @@ ng_test_library(
6161
ng_web_test_suite(
6262
name = "unit_tests",
6363
deps = [":sidenav_test_sources"],
64-
prebuilt_theme = True,
6564
)

src/lib/slide-toggle/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,4 @@ ng_test_library(
5757
ng_web_test_suite(
5858
name = "unit_tests",
5959
deps = [":slide_toggle_test_sources"],
60-
prebuilt_theme = True,
6160
)

src/lib/slider/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,4 @@ ng_test_library(
5656
ng_web_test_suite(
5757
name = "unit_tests",
5858
deps = [":slider_test_sources"],
59-
prebuilt_theme = True,
6059
)

src/lib/snack-bar/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,4 @@ ng_test_library(
6565
ng_web_test_suite(
6666
name = "unit_tests",
6767
deps = [":snack_bar_test_sources"],
68-
prebuilt_theme = True,
6968
)

src/lib/sort/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,4 @@ ng_test_library(
5454
ng_web_test_suite(
5555
name = "unit_tests",
5656
deps = [":sort_test_sources"],
57-
prebuilt_theme = True,
5857
)

src/lib/stepper/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,4 @@ ng_test_library(
7474
ng_web_test_suite(
7575
name = "unit_tests",
7676
deps = [":stepper_test_sources"],
77-
prebuilt_theme = True,
7877
)

src/lib/table/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,4 @@ ng_test_library(
5454
ng_web_test_suite(
5555
name = "unit_tests",
5656
deps = [":table_test_sources"],
57-
prebuilt_theme = True,
5857
)

src/lib/tabs/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,5 +108,4 @@ ng_test_library(
108108
ng_web_test_suite(
109109
name = "unit_tests",
110110
deps = [":tabs_test_sources"],
111-
prebuilt_theme = True,
112111
)

src/lib/toolbar/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ ng_test_library(
4444
ng_web_test_suite(
4545
name = "unit_tests",
4646
deps = [":toolbar_test_sources"],
47-
prebuilt_theme = True,
4847
)
4948

5049

src/lib/tooltip/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,4 @@ ng_test_library(
6565
ng_web_test_suite(
6666
name = "unit_tests",
6767
deps = [":tooltip_test_sources"],
68-
prebuilt_theme = True,
6968
)

src/lib/tree/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,4 @@ ng_test_library(
4949
ng_web_test_suite(
5050
name = "unit_tests",
5151
deps = [":tree_test_sources"],
52-
prebuilt_theme = True,
5352
)

tools/defaults.bzl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,12 @@ def ng_test_library(deps = [], tsconfig = None, **kwargs):
7272
**kwargs
7373
)
7474

75-
def ng_web_test_suite(deps = [], srcs = [], static_css = [], prebuilt_theme = False,
76-
bootstrap = [], **kwargs):
77-
78-
# We add a option for including a prebuilt theme in the test suite because otherwise there
79-
# will be a lot of code duplication and it just requires more work to setup a test suite.
80-
if prebuilt_theme:
81-
static_css = static_css + ["//src/lib/prebuilt-themes:indigo-pink"]
75+
def ng_web_test_suite(deps = [], srcs = [], static_css = [], bootstrap = [], **kwargs):
76+
# Always include a prebuilt theme in the test suite because otherwise tests, which depend on CSS
77+
# that is needed for measuring, will unexpectedly fail. Also always adding a prebuilt theme
78+
# reduces the amount of setup that is needed to create a test suite Bazel target. Note that the
79+
# prebuilt theme will be also added to CDK test suites but shouldn't affect anything.
80+
static_css = static_css + ["//src/lib/prebuilt-themes:indigo-pink"]
8281

8382
# Workaround for https://github.com/bazelbuild/rules_typescript/issues/301
8483
# Since some of our tests depend on CSS files which are not part of the `ng_module` rule,

0 commit comments

Comments
 (0)