Skip to content

Commit

Permalink
feat(core): Angular 13 support #918
Browse files Browse the repository at this point in the history
  • Loading branch information
satanTime committed Sep 12, 2021
1 parent 5fad43c commit 3452363
Show file tree
Hide file tree
Showing 43 changed files with 14,839 additions and 157 deletions.
62 changes: 62 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,59 @@ jobs:
- run:
name: Unit Tests
command: npm run test:a12es2015ivy
'Angular 13 Install':
docker:
- image: satantime/puppeteer-node:12.22.6
steps:
- checkout
- restore_cache:
key: a13-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a13/package-lock.json" }}
- run:
name: NPM Install
command: |
if [ ! -d "e2e/a13/node_modules/" ]; then
npm run i:ci:a13
fi
- save_cache:
key: a13-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a13/package-lock.json" }}
paths:
- ./e2e/a13/node_modules
'Angular 13 ES5 Ivy':
docker:
- image: satantime/puppeteer-node:12.22.6
steps:
- checkout
- attach_workspace:
at: dist
- restore_cache:
key: a13-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a13/package-lock.json" }}
- run:
name: Spreading Build
command: npm run s:a13
- run:
name: Spreading Tests
command: npm run s:test:a13
- run:
name: Unit Tests
command: npm run test:a13es5ivy
'Angular 13 ES2020 Ivy':
docker:
- image: satantime/puppeteer-node:12.22.6
steps:
- checkout
- attach_workspace:
at: dist
- restore_cache:
key: a13-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a13/package-lock.json" }}
- run:
name: Spreading Build
command: npm run s:a13
- run:
name: Spreading Tests
command: npm run s:test:a13
- run:
name: Unit Tests
command: npm run test:a13es2015ivy
'Angular Jasmine ES5 Ivy':
docker:
- image: satantime/puppeteer-node:14.17.6
Expand Down Expand Up @@ -859,6 +912,9 @@ workflows:
- 'Angular 12 Install':
requires:
- Core
- 'Angular 13 Install':
requires:
- Core
- 'Angular 5 ES5':
requires:
- Core
Expand Down Expand Up @@ -925,6 +981,12 @@ workflows:
- 'Angular 12 ES2020 Ivy':
requires:
- Angular 12 Install
- 'Angular 13 ES5 Ivy':
requires:
- Angular 13 Install
- 'Angular 13 ES2020 Ivy':
requires:
- Angular 13 Install
- 'Angular Jasmine ES5 Ivy':
requires:
- Angular Install
Expand Down
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/e2e/a10/node_modules
/e2e/a11/node_modules
/e2e/a12/node_modules
/e2e/a13/node_modules
/e2e/a-jasmine/node_modules
/e2e/a-jest/node_modules
/e2e/a-min/node_modules
Expand Down
76 changes: 76 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,21 @@ jobs:
path: e2e/a12/node_modules
key: ${{ runner.os }}-a12-v1-${{ hashFiles('./e2e/a12/package-lock.json') }}

- name: e2e/a13/node_modules
id: a13
uses: actions/cache@v2
with:
path: e2e/a13/node_modules
key: ${{ runner.os }}-a13-v1-${{ hashFiles('./e2e/a13/package-lock.json') }}

- name: Install A12 dependencies
if: steps.a12.outputs.cache-hit != 'true'
run: npm run i:ci:a12

- name: Install A13 dependencies
if: steps.a13.outputs.cache-hit != 'true'
run: npm run i:ci:a13

- name: e2e/a-jasmine/node_modules
id: a-jasmine
uses: actions/cache@v2
Expand Down Expand Up @@ -1026,6 +1037,71 @@ jobs:
run: npm run s:test:a12
- name: Unit Tests
run: npm run test:a12es2015ivy

a13es5ivy:
needs: Install
runs-on: ubuntu-latest
name: A13 es5 Ivy

steps:
- uses: actions/checkout@v2
- name: Node
uses: actions/setup-node@v2
with:
node-version: 14.16.0

- name: e2e/a13/node_modules
id: cache
uses: actions/cache@v2
with:
path: e2e/a13/node_modules
key: ${{ runner.os }}-a13-v1-${{ hashFiles('./e2e/a13/package-lock.json') }}

- name: Workspace
uses: actions/download-artifact@v2
with:
name: workspace
path: dist

- name: Spreading Build
run: npm run s:a13
- name: Spreading Tests
run: npm run s:test:a13
- name: Unit Tests
run: npm run test:a13es5ivy

a13es2015ivy:
needs: Install
runs-on: ubuntu-latest
name: A13 es2015 Ivy

steps:
- uses: actions/checkout@v2
- name: Node
uses: actions/setup-node@v2
with:
node-version: 14.16.0

- name: e2e/a13/node_modules
id: cache
uses: actions/cache@v2
with:
path: e2e/a13/node_modules
key: ${{ runner.os }}-a13-v1-${{ hashFiles('./e2e/a13/package-lock.json') }}

- name: Workspace
uses: actions/download-artifact@v2
with:
name: workspace
path: dist

- name: Spreading Build
run: npm run s:a13
- name: Spreading Tests
run: npm run s:test:a13
- name: Unit Tests
run: npm run test:a13es2015ivy

ajasminees5ivy:
needs: Install
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ docs/.docusaurus
e2e/a10/src/test
e2e/a11/src/test
e2e/a12/src/test
e2e/a13/src/test
e2e/a5es2015/src/test
e2e/a5es5/src/test
e2e/a6/src/test
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ VOLUME /app/e2e/a9/node_modules
VOLUME /app/e2e/a10/node_modules
VOLUME /app/e2e/a11/node_modules
VOLUME /app/e2e/a12/node_modules
VOLUME /app/e2e/a13/node_modules
VOLUME /app/e2e/a-jasmine/node_modules
VOLUME /app/e2e/a-jest/node_modules
VOLUME /app/e2e/a-min/node_modules
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ The current version of the library **has been tested** and **can be used** with:

| Angular | ng-mocks | Jasmine | Jest | Ivy |
| ------: | :------: | :-----: | :--: | :-: |
| 13 | latest | yes | yes | yes |
| 12 | latest | yes | yes | yes |
| 11 | latest | yes | yes | yes |
| 10 | latest | yes | yes | yes |
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ services:
- /app/e2e/a10/node_modules
- /app/e2e/a11/node_modules
- /app/e2e/a12/node_modules
- /app/e2e/a13/node_modules
- /app/e2e/a-jasmine/node_modules
- /app/e2e/a-jest/node_modules
- /app/e2e/a-min/node_modules
17 changes: 9 additions & 8 deletions docs/articles/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@ keeping interfaces as they are, but suppressing their implementation.

The current version of `ng-mocks` has been tested and **can be used** with:

- Angular 12 (Jasmine, Jest, Ivy, es5, es2015)
- Angular 11 (Jasmine, Jest, Ivy, es5, es2015)
- Angular 10 (Jasmine, Jest, Ivy, es5, es2015)
- Angular 9 (Jasmine, Jest, Ivy, es5, es2015)
- Angular 8 (Jasmine, Jest, es5, es2015)
- Angular 7 (Jasmine, Jest, es5, es2015)
- Angular 6 (Jasmine, Jest, es5, es2015)
- Angular 5 (Jasmine, Jest, es5, es2015)
- Angular 13 (Jasmine, Jest, Ivy, es5, es2015+)
- Angular 12 (Jasmine, Jest, Ivy, es5, es2015+)
- Angular 11 (Jasmine, Jest, Ivy, es5, es2015+)
- Angular 10 (Jasmine, Jest, Ivy, es5, es2015+)
- Angular 9 (Jasmine, Jest, Ivy, es5, es2015+)
- Angular 8 (Jasmine, Jest, es5, es2015+)
- Angular 7 (Jasmine, Jest, es5, es2015+)
- Angular 6 (Jasmine, Jest, es5, es2015+)
- Angular 5 (Jasmine, Jest, es5, es2015+)

In the header menu we can find **preconfigured sandboxes**, where we could **check all the features**.
To focus on a particular one, simply prefix it with `fdescribe` or `fit`.
Expand Down
30 changes: 29 additions & 1 deletion e2e/a-jasmine/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 29 additions & 1 deletion e2e/a-jest/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3452363

Please sign in to comment.