Skip to content

Commit 7c72c87

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

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
},

0 commit comments

Comments
 (0)