Skip to content

Commit

Permalink
Merge branch 'master' into issues/4486
Browse files Browse the repository at this point in the history
  • Loading branch information
satanTime authored Aug 26, 2024
2 parents 1a80e08 + 0088eb1 commit 8b60673
Show file tree
Hide file tree
Showing 66 changed files with 31,659 additions and 30,420 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ orbs:
executors:
core:
docker:
- image: satantime/puppeteer-node:20.15.1
- image: satantime/puppeteer-node:20.17.0
resource_class: medium
a5:
docker:
Expand Down Expand Up @@ -59,15 +59,15 @@ executors:
resource_class: medium
a16:
docker:
- image: satantime/puppeteer-node:18.20.3
- image: satantime/puppeteer-node:18.20.4
resource_class: medium
a17:
docker:
- image: satantime/puppeteer-node:20.15.1
- image: satantime/puppeteer-node:20.17.0
resource_class: medium
a18:
docker:
- image: satantime/puppeteer-node:20.15.1
- image: satantime/puppeteer-node:20.17.0
resource_class: medium

commands:
Expand Down
2 changes: 2 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ overrides:
'@typescript-eslint/no-empty-interface': off
'@typescript-eslint/no-explicit-any': off
'@typescript-eslint/no-namespace': off
'@typescript-eslint/no-require-imports': off
'@typescript-eslint/no-restricted-types': error
'@typescript-eslint/no-this-alias': off
'@typescript-eslint/no-unsafe-declaration-merging': off
'@typescript-eslint/no-unused-vars': error
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.15.1
20.17.0
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [14.13.1](https://github.com/help-me-mom/ng-mocks/compare/v14.13.0...v14.13.1) (2024-08-25)


### Bug Fixes

* unable to bind ngIf in angular 17+ ([7c816e6](https://github.com/help-me-mom/ng-mocks/commit/7c816e67ced783e943653d10aef2cdc393ffe8e0)), closes [#8884](https://github.com/help-me-mom/ng-mocks/issues/8884)

# [14.13.0](https://github.com/help-me-mom/ng-mocks/compare/v14.12.2...v14.13.0) (2024-06-01)


Expand Down
12 changes: 11 additions & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# This is a comment.
# Each line is a file pattern followed by one or more owners.
* @satanTime
* @satanTime

**/.nvmrc
**/compose.yml
**/package.json
**/package-lock.json

/.circleci/config.yml
/.github/workflows/codeql.yml

/libs/ng-mocks/package.json @satanTime
20 changes: 10 additions & 10 deletions compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
ng-mocks:
image: satantime/puppeteer-node:20.15.1
image: satantime/puppeteer-node:20.17.0
working_dir: /app
volumes:
- .:/app
Expand All @@ -12,7 +12,7 @@ services:
- --no-audit

docs:
image: satantime/puppeteer-node:20.15.1
image: satantime/puppeteer-node:20.17.0
working_dir: /app
volumes:
- ./docs:/app
Expand All @@ -24,7 +24,7 @@ services:
- --no-audit

e2e:
image: satantime/puppeteer-node:20.15.1
image: satantime/puppeteer-node:20.17.0
working_dir: /app
volumes:
- ./tests-e2e:/app
Expand Down Expand Up @@ -190,7 +190,7 @@ services:
- --no-audit

a16:
image: satantime/puppeteer-node:18.20.3
image: satantime/puppeteer-node:18.20.4
working_dir: /app
volumes:
- ./e2e/a16:/app
Expand All @@ -202,7 +202,7 @@ services:
- --no-audit

a17:
image: satantime/puppeteer-node:20.15.1
image: satantime/puppeteer-node:20.17.0
working_dir: /app
volumes:
- ./e2e/a17:/app
Expand All @@ -214,7 +214,7 @@ services:
- --no-audit

a18:
image: satantime/puppeteer-node:20.15.1
image: satantime/puppeteer-node:20.17.0
working_dir: /app
volumes:
- ./e2e/a18:/app
Expand All @@ -226,7 +226,7 @@ services:
- --no-audit

jasmine:
image: satantime/puppeteer-node:20.15.1
image: satantime/puppeteer-node:20.17.0
working_dir: /app
volumes:
- ./e2e/jasmine:/app
Expand All @@ -238,7 +238,7 @@ services:
- --no-audit

jest:
image: satantime/puppeteer-node:20.15.1
image: satantime/puppeteer-node:20.17.0
working_dir: /app
volumes:
- ./e2e/jest:/app
Expand All @@ -250,7 +250,7 @@ services:
- --no-audit

min:
image: satantime/puppeteer-node:20.15.1
image: satantime/puppeteer-node:20.17.0
working_dir: /app
volumes:
- ./e2e/min:/app
Expand All @@ -262,7 +262,7 @@ services:
- --no-audit

nx:
image: satantime/puppeteer-node:20.15.1
image: satantime/puppeteer-node:20.17.0
working_dir: /app
volumes:
- ./e2e/nx:/app
Expand Down
2 changes: 1 addition & 1 deletion docs/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.15.1
20.17.0
4 changes: 2 additions & 2 deletions docs/articles/guides/routing-guard.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ The example below is applicable for all types of guards:
[CodeSandbox](https://codesandbox.io/p/sandbox/github/help-me-mom/ng-mocks-sandbox/tree/tests/?file=/src/examples/TestRoutingGuard/can-match.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanMatch),
[StackBlitz](https://stackblitz.com/github/help-me-mom/ng-mocks-sandbox/tree/tests?file=src/examples/TestRoutingGuard/can-match.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanMatch)
- `canLoad` -
[CodeSandbox](https://codesandbox.io/p/sandbox/github/help-me-mom/ng-mocks-sandbox/tree/tests/?file=/src/examples/TestRoutingGuard/can-match.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanMatch),
[StackBlitz](https://stackblitz.com/github/help-me-mom/ng-mocks-sandbox/tree/tests?file=src/examples/TestRoutingGuard/can-match.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanMatch)
[CodeSandbox](https://codesandbox.io/p/sandbox/github/help-me-mom/ng-mocks-sandbox/tree/tests/?file=/src/examples/TestRoutingGuard/can-load.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanLoad),
[StackBlitz](https://stackblitz.com/github/help-me-mom/ng-mocks-sandbox/tree/tests?file=src/examples/TestRoutingGuard/can-load.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanLoad)
- class guards (legacy) -
[CodeSandbox](https://codesandbox.io/p/sandbox/github/help-me-mom/ng-mocks-sandbox/tree/tests/?file=/src/examples/TestRoutingGuard/test.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3Atest),
[StackBlitz](https://stackblitz.com/github/help-me-mom/ng-mocks-sandbox/tree/tests?file=src/examples/TestRoutingGuard/test.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3Atest)
Expand Down
4 changes: 2 additions & 2 deletions docs/articles/migrations.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ Previously, it had been accepting a `meta` parameter, now it has been removed.

#### Tokens

- `NG_GUARDS` has been renamed to [`NG_MOCKS_GUARDS`](api/MockBuilder.md#ngmocksguards-token)
- `NG_INTERCEPTORS` has been renamed to [`NG_MOCKS_INTERCEPTORS`](api/MockBuilder.md#ngmocksinterceptors-token)
- `NG_GUARDS` has been renamed to [`NG_MOCKS_GUARDS`](api/MockBuilder.md#ng_mocks_guards-token)
- `NG_INTERCEPTORS` has been renamed to [`NG_MOCKS_INTERCEPTORS`](api/MockBuilder.md#ng_mocks_interceptors-token)

## From 9 to 10

Expand Down
2 changes: 1 addition & 1 deletion docs/articles/troubleshooting/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ beforeEach(() =>
);
```

Or, you can keep all root providers with help of [`NG_MOCKS_ROOT_PROVIDERS`](../api/MockBuilder.md#ngmocksrootproviders-token).
Or, you can keep all root providers with help of [`NG_MOCKS_ROOT_PROVIDERS`](../api/MockBuilder.md#ng_mocks_root_providers-token).

```ts
beforeEach(() =>
Expand Down
Loading

0 comments on commit 8b60673

Please sign in to comment.