Skip to content

Commit b112a44

Browse files
committed
test(e2e): separation of root and tests-e2e
1 parent 1bdd239 commit b112a44

12 files changed

+26426
-542
lines changed

.circleci/config.yml

+17-5
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
command: npx commitlint --from=origin/master
132132
- run:
133133
name: Lint code style
134-
command: npm run lint -- --ignore-pattern e2e/
134+
command: npm run lint -- --ignore-pattern e2e/ --ignore-pattern tests-e2e/
135135
- run:
136136
name: Lint typescript
137137
command: npm run ts:check
@@ -190,7 +190,17 @@ jobs:
190190
steps:
191191
- checkout
192192
- restore_cache:
193-
key: root-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "package-lock.json" }}
193+
key: tests-e2e-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "tests-e2e/package-lock.json" }}
194+
- run:
195+
name: NPM Install
196+
command: |
197+
if [ ! -d "./tests-e2e/node_modules/" ]; then
198+
npm run i:tests-e2e
199+
fi
200+
- save_cache:
201+
key: tests-e2e-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "tests-e2e/package-lock.json" }}
202+
paths:
203+
- ./tests-e2e/node_modules
194204
- run:
195205
name: E2E
196206
command: npm run e2e
@@ -247,9 +257,6 @@ jobs:
247257
- run:
248258
name: MockRender
249259
command: KARMA_SUITE=tests-performance/mock-render.spec.ts npm run test
250-
- run:
251-
name: Large Modules
252-
command: KARMA_SUITE=tests-performance/ng-mocks.spec.ts npm run test
253260
IE:
254261
executor:
255262
name: win/default
@@ -267,6 +274,9 @@ jobs:
267274
- matches:
268275
pattern: '(renovate|dependabot/npm_and_yarn)/docs/.*'
269276
value: << pipeline.git.branch >>
277+
- matches:
278+
pattern: '(renovate|dependabot/npm_and_yarn)/tests-e2e/.*'
279+
value: << pipeline.git.branch >>
270280
- matches:
271281
pattern: 'master|alpha|beta|next|rc'
272282
value: << pipeline.git.branch >>
@@ -420,6 +430,8 @@ workflows:
420430
- rc
421431
- /renovate\/docs\/.*/
422432
- /dependabot\/npm_and_yarn\/docs\/.*/
433+
- /renovate\/tests-e2e\/.*/
434+
- /dependabot\/npm_and_yarn\/tests-e2e\/.*/
423435
- Performance:
424436
name: core:performance
425437
requires:

docker-compose.yml

+13
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,19 @@ services:
2727
- --no-audit
2828
- --omit=optional
2929

30+
e2e:
31+
image: satantime/puppeteer-node:16.15.1
32+
working_dir: /app
33+
volumes:
34+
- ./tests-e2e:/app
35+
- /root/.node-gyp
36+
- /root/.npm
37+
command:
38+
- npm
39+
- install
40+
- --no-audit
41+
- --omit=optional
42+
3043
a5es5:
3144
image: satantime/puppeteer-node:6.17.1
3245
working_dir: /app

0 commit comments

Comments
 (0)