Skip to content

Commit ed90a8b

Browse files
committed
test: remove non-bazel test setup
1 parent bdfeefe commit ed90a8b

File tree

84 files changed

+36
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+36
-327
lines changed

.circleci/config.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,6 @@ jobs:
175175
- custom_attach_workspace
176176
- run: yarn validate --ci
177177

178-
test:
179-
executor: action-executor
180-
steps:
181-
- custom_attach_workspace
182-
- run: yarn test --full
183-
184178
integration:
185179
executor: heavy-test-executor
186180
steps:
@@ -324,7 +318,6 @@ jobs:
324318
steps:
325319
- custom_attach_workspace
326320
- setup_windows
327-
- run: yarn test --full
328321
# Run partial e2e suite on PRs only. Master will run the full e2e suite with sharding.
329322
- run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }
330323

@@ -358,10 +351,6 @@ workflows:
358351
- build-bazel:
359352
requires:
360353
- build
361-
- test:
362-
requires:
363-
- build
364-
# TODO: ng-packagr spec large also needs to be moved to bazel
365354
- integration:
366355
requires:
367356
- build
@@ -417,8 +406,8 @@ workflows:
417406
- build
418407
- test-win:
419408
requires:
409+
- build-bazel
420410
- setup-and-build-win
421-
- test
422411
- e2e-cli-win:
423412
<<: *only_release_branches
424413
requires:
@@ -429,13 +418,13 @@ workflows:
429418
- snapshot_publish:
430419
<<: *only_release_branches
431420
requires:
432-
- test
433421
- build
422+
- build-bazel
434423
- e2e-cli
435424
- publish:
436425
requires:
437-
- test
438426
- build
427+
- build-bazel
439428
- e2e-cli
440429
- snapshot_publish
441430
filters:

integration/build_angular/package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66
"scripts": {
77
"postinstall": "tsc -p tests/tsconfig.json",
88
"pretest-app-shell": "yarn webdriver-update",
9-
"test-app-shell": "jasmine \"tests-tsc-out/app-shell/**/*_spec_large.js\"",
10-
"test-browser-1": "jasmine \"tests-tsc-out/browser-1/**/*_spec_large.js\"",
11-
"test-browser-2": "jasmine \"tests-tsc-out/browser-2/**/*_spec_large.js\"",
12-
"test-browser-3": "jasmine \"tests-tsc-out/browser-3/**/*_spec_large.js\"",
13-
"test-browser-4": "jasmine \"tests-tsc-out/browser-4/**/*_spec_large.js\"",
14-
"test-dev-server": "jasmine \"tests-tsc-out/dev-server/**/*_spec_large.js\"",
15-
"test-extract-i18n": "jasmine \"tests-tsc-out/extract-i18n/**/*_spec_large.js\"",
16-
"test-karma": "jasmine \"tests-tsc-out/karma/**/*_spec_large.js\"",
9+
"test-app-shell": "jasmine \"tests-tsc-out/app-shell/**/*_spec.js\"",
10+
"test-browser-1": "jasmine \"tests-tsc-out/browser-1/**/*_spec.js\"",
11+
"test-browser-2": "jasmine \"tests-tsc-out/browser-2/**/*_spec.js\"",
12+
"test-browser-3": "jasmine \"tests-tsc-out/browser-3/**/*_spec.js\"",
13+
"test-browser-4": "jasmine \"tests-tsc-out/browser-4/**/*_spec.js\"",
14+
"test-dev-server": "jasmine \"tests-tsc-out/dev-server/**/*_spec.js\"",
15+
"test-extract-i18n": "jasmine \"tests-tsc-out/extract-i18n/**/*_spec.js\"",
16+
"test-karma": "jasmine \"tests-tsc-out/karma/**/*_spec.js\"",
1717
"pretest-protractor": "yarn webdriver-update",
18-
"test-protractor": "jasmine \"tests-tsc-out/protractor/**/*_spec_large.js\"",
19-
"test-server": "jasmine \"tests-tsc-out/server/**/*_spec_large.js\"",
20-
"test-tslint": "jasmine \"tests-tsc-out/tslint/**/*_spec_large.js\"",
18+
"test-protractor": "jasmine \"tests-tsc-out/protractor/**/*_spec.js\"",
19+
"test-server": "jasmine \"tests-tsc-out/server/**/*_spec.js\"",
20+
"test-tslint": "jasmine \"tests-tsc-out/tslint/**/*_spec.js\"",
2121
"//view-engine-suites": "",
2222
"jasmine-ve": "jasmine --helper=./tests-tsc-out/enable-ve.js",
23-
"test-browser-1-ve": "yarn jasmine-ve \"tests-tsc-out/browser-1/**/*_spec_large.js\"",
24-
"test-browser-2-ve": "yarn jasmine-ve \"tests-tsc-out/browser-2/**/*_spec_large.js\"",
25-
"test-browser-3-ve": "yarn jasmine-ve \"tests-tsc-out/browser-3/**/*_spec_large.js\"",
26-
"test-browser-4-ve": "yarn jasmine-ve \"tests-tsc-out/browser-4/**/*_spec_large.js\"",
27-
"test-extract-i18n-ve": "yarn jasmine-ve \"tests-tsc-out/extract-i18n/**/*_spec_large.js\"",
28-
"test-server-ve": "yarn jasmine-ve \"tests-tsc-out/server/**/*_spec_large.js\"",
23+
"test-browser-1-ve": "yarn jasmine-ve \"tests-tsc-out/browser-1/**/*_spec.js\"",
24+
"test-browser-2-ve": "yarn jasmine-ve \"tests-tsc-out/browser-2/**/*_spec.js\"",
25+
"test-browser-3-ve": "yarn jasmine-ve \"tests-tsc-out/browser-3/**/*_spec.js\"",
26+
"test-browser-4-ve": "yarn jasmine-ve \"tests-tsc-out/browser-4/**/*_spec.js\"",
27+
"test-extract-i18n-ve": "yarn jasmine-ve \"tests-tsc-out/extract-i18n/**/*_spec.js\"",
28+
"test-server-ve": "yarn jasmine-ve \"tests-tsc-out/server/**/*_spec.js\"",
2929
"//webdriver-update-README": "ChromeDriver version must match Puppeteer Chromium version, see https://github.com/GoogleChrome/puppeteer/releases http://chromedriver.chromium.org/downloads",
3030
"webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 79.0.3945.16"
3131
},

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
"fix": "node ./bin/devkit-admin lint --fix",
3333
"lint": "node ./bin/devkit-admin lint",
3434
"templates": "node ./bin/devkit-admin templates",
35-
"test": "node ./bin/devkit-admin test",
36-
"test-large": "node ./bin/devkit-admin test --large --spec-reporter",
3735
"validate": "node ./bin/devkit-admin validate",
3836
"validate-commits": "./bin/devkit-admin validate-commits",
3937
"preinstall": "node ./tools/yarn/check-yarn.js",

packages/angular/cli/BUILD.bazel

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ ts_library(
1515
name = "angular-cli",
1616
srcs = glob(
1717
["**/*.ts"],
18-
exclude = [
19-
"**/*_spec.ts",
20-
"**/*_spec_large.ts",
21-
],
18+
exclude = ["**/*_spec.ts"],
2219
) + [
2320
"//packages/angular/cli:lib/config/schema.ts",
2421
"//packages/angular/cli:commands/analytics.ts",
@@ -226,12 +223,7 @@ ts_json_schema(
226223
ts_library(
227224
name = "angular-cli_test_lib",
228225
testonly = True,
229-
srcs = glob(
230-
include = [
231-
"**/*_spec.ts",
232-
"**/*_spec_large.ts",
233-
],
234-
),
226+
srcs = glob(["**/*_spec.ts"]),
235227
# strict_checks = False,
236228
tsconfig = "//:tsconfig-test.json",
237229
deps = [

packages/angular/pwa/BUILD.bazel

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ ts_library(
2323
exclude = [
2424
"pwa/files/**/*",
2525
"**/*_spec.ts",
26-
"**/*_spec_large.ts",
2726
],
2827
) + [
2928
"//packages/angular/pwa:pwa/schema.ts",
@@ -54,12 +53,7 @@ ts_json_schema(
5453
ts_library(
5554
name = "pwa_test_lib",
5655
testonly = True,
57-
srcs = glob(
58-
include = [
59-
"pwa/**/*_spec.ts",
60-
"pwa/**/*_spec_large.ts",
61-
],
62-
),
56+
srcs = glob(["pwa/**/*_spec.ts"]),
6357
# strict_checks = False,
6458
tsconfig = "//:tsconfig-test.json",
6559
deps = [

packages/angular_devkit/architect/BUILD.bazel

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ ts_library(
4141
name = "architect",
4242
srcs = glob(
4343
include = ["src/**/*.ts"],
44-
exclude = [
45-
"**/*_spec.ts",
46-
"**/*_spec_large.ts",
47-
],
44+
exclude = ["**/*_spec.ts"],
4845
) + [
4946
"//packages/angular_devkit/architect:src/input-schema.ts",
5047
"//packages/angular_devkit/architect:src/output-schema.ts",
@@ -66,12 +63,7 @@ ts_library(
6663
ts_library(
6764
name = "architect_test_lib",
6865
testonly = True,
69-
srcs = glob(
70-
include = [
71-
"src/**/*_spec.ts",
72-
"src/**/*_spec_large.ts",
73-
],
74-
),
66+
srcs = glob(["src/**/*_spec.ts"]),
7567
# strict_checks = False,
7668
tsconfig = "//:tsconfig-test.json",
7769
deps = [

packages/angular_devkit/architect/node/BUILD.bazel

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ ts_library(
1313
name = "node",
1414
srcs = glob(
1515
include = ["**/*.ts"],
16-
exclude = [
17-
"**/*_spec.ts",
18-
"**/*_spec_large.ts",
19-
],
16+
exclude = ["**/*_spec.ts"],
2017
),
2118
module_name = "@angular-devkit/architect/node",
2219
module_root = "index.d.ts",

packages/angular_devkit/architect/testing/BUILD.bazel

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ ts_library(
1313
name = "testing",
1414
srcs = glob(
1515
include = ["**/*.ts"],
16-
exclude = [
17-
"**/*_spec.ts",
18-
"**/*_spec_large.ts",
19-
],
16+
exclude = ["**/*_spec.ts"],
2017
),
2118
module_name = "@angular-devkit/architect/testing",
2219
module_root = "index.d.ts",

packages/angular_devkit/benchmark/BUILD.bazel

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ ts_library(
1818
include = ["src/**/*.ts"],
1919
exclude = [
2020
"src/**/*_spec.ts",
21-
"src/**/*_spec_large.ts",
2221
"src/**/*_benchmark.ts",
2322
],
2423
),
@@ -36,12 +35,7 @@ ts_library(
3635
ts_library(
3736
name = "benchmark_test_lib",
3837
testonly = True,
39-
srcs = glob(
40-
include = [
41-
"src/**/*_spec.ts",
42-
"src/**/*_spec_large.ts",
43-
],
44-
),
38+
srcs = glob(["src/**/*_spec.ts"]),
4539
data = [
4640
"src/test/exit-code-one.js",
4741
"src/test/fibonacci.js",

packages/angular_devkit/build_angular/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ ts_library(
180180
include = [
181181
"plugins/**/*_spec.ts",
182182
"src/**/*_spec.ts",
183-
"src/**/*_spec_large.ts",
184183
],
185184
),
186185
data = glob(["test/**/*"]),

packages/angular_devkit/build_optimizer/BUILD.bazel

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ ts_library(
2121
# from jasmine_node_test.
2222
"src/**/cli.ts",
2323
"src/**/*_spec.ts",
24-
"src/**/*_spec_large.ts",
2524
"src/**/*_benchmark.ts",
2625
],
2726
),
@@ -46,12 +45,7 @@ ts_library(
4645
ts_library(
4746
name = "build_optimizer_test_lib",
4847
testonly = True,
49-
srcs = glob(
50-
include = [
51-
"src/**/*_spec.ts",
52-
"src/**/*_spec_large.ts",
53-
],
54-
),
48+
srcs = glob(["src/**/*_spec.ts"]),
5549
# @external_begin
5650
tsconfig = "//:tsconfig-test.json",
5751
deps = [

packages/angular_devkit/build_webpack/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ ts_library(
6464
include = [
6565
"src/test-utils.ts",
6666
"src/**/*_spec.ts",
67-
"src/**/*_spec_large.ts",
6867
],
6968
),
7069
data = glob(

packages/angular_devkit/core/BUILD.bazel

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ ts_library(
2222
include = ["src/**/*.ts"],
2323
exclude = [
2424
"src/**/*_spec.ts",
25-
"src/**/*_spec_large.ts",
2625
"src/**/*_benchmark.ts",
2726
],
2827
),
@@ -51,12 +50,7 @@ ts_library(
5150
ts_library(
5251
name = "core_test_lib",
5352
testonly = True,
54-
srcs = glob(
55-
include = [
56-
"src/**/*_spec.ts",
57-
"src/**/*_spec_large.ts",
58-
],
59-
),
53+
srcs = glob(["src/**/*_spec.ts"]),
6054
data = glob(["src/workspace/json/test/**/*.json"]) + [
6155
"src/experimental/workspace/test/test-workspace.json",
6256
"src/experimental/workspace/workspace-schema.json",

packages/angular_devkit/core/node/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ ts_library(
1616
exclude = [
1717
"testing/**/*.ts",
1818
"**/*_spec.ts",
19-
"**/*_spec_large.ts",
2019
"**/*_benchmark.ts",
2120
],
2221
),
@@ -37,7 +36,6 @@ ts_library(
3736
srcs = glob(
3837
include = [
3938
"**/*_spec.ts",
40-
"**/*_spec_large.ts",
4139
],
4240
exclude = [
4341
"testing/**/*.ts",

packages/angular_devkit/core/node/testing/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ts_library(
1414
include = ["**/*.ts"],
1515
exclude = [
1616
"**/*_spec.ts",
17-
"**/*_spec_large.ts",
1817
"**/*_benchmark.ts",
1918
],
2019
),

packages/angular_devkit/schematics/BUILD.bazel

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ ts_library(
2222
include = ["src/**/*.ts"],
2323
exclude = [
2424
"src/**/*_spec.ts",
25-
"src/**/*_spec_large.ts",
2625
"src/**/*_benchmark.ts",
2726
],
2827
),
@@ -42,12 +41,7 @@ ts_library(
4241
ts_library(
4342
name = "schematics_test_lib",
4443
testonly = True,
45-
srcs = glob(
46-
include = [
47-
"src/**/*_spec.ts",
48-
"src/**/*_spec_large.ts",
49-
],
50-
),
44+
srcs = glob(["src/**/*_spec.ts"]),
5145
# @external_begin
5246
tsconfig = "//:tsconfig-test.json",
5347
# @external_end

packages/angular_devkit/schematics/tasks/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ ts_library(
4242
srcs = glob(
4343
include = [
4444
"**/*_spec.ts",
45-
"**/*_spec_large.ts",
4645
"tslint-fix/test/**/*.ts",
4746
],
4847
exclude = [

packages/angular_devkit/schematics/tools/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ ts_library(
4040
srcs = glob(
4141
include = [
4242
"**/*_spec.ts",
43-
"**/*_spec_large.ts",
4443
"test/**/*.ts",
4544
],
4645
),

packages/angular_devkit/schematics_cli/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ ts_library(
1717
include = ["bin/**/*.ts"],
1818
exclude = [
1919
"bin/**/*_spec.ts",
20-
"bin/**/*_spec_large.ts",
2120
"bin/**/*_benchmark.ts",
2221
],
2322
),

packages/schematics/angular/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ ts_library(
3535
include = ["**/*.ts"],
3636
exclude = [
3737
"**/*_spec.ts",
38-
"**/*_spec_large.ts",
3938
"**/*_benchmark.ts",
4039
# Also exclude templated files.
4140
"*/files/**/*.ts",
@@ -85,7 +84,6 @@ ts_library(
8584
srcs = glob(
8685
include = [
8786
"**/*_spec.ts",
88-
"**/*_spec_large.ts",
8987
"utility/test/**/*.ts",
9088
],
9189
),

packages/schematics/schematics/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ ts_library(
1616
include = ["**/*.ts"],
1717
exclude = [
1818
"**/*_spec.ts",
19-
"**/*_spec_large.ts",
2019
"**/*_benchmark.ts",
2120
"schematic/files/**",
2221
"blank/project-files/**",

0 commit comments

Comments
 (0)