Skip to content

Commit

Permalink
Merge pull request #3271 from satanTime/issues/3265
Browse files Browse the repository at this point in the history
  • Loading branch information
satanTime authored Aug 7, 2022
2 parents dd09c96 + 1bea651 commit 33a88c6
Show file tree
Hide file tree
Showing 11 changed files with 11,720 additions and 13,461 deletions.
5,600 changes: 2,495 additions & 3,105 deletions docs/package-lock.json

Large diffs are not rendered by default.

5,356 changes: 2,576 additions & 2,780 deletions e2e/a14/package-lock.json

Large diffs are not rendered by default.

1,259 changes: 633 additions & 626 deletions e2e/jasmine/package-lock.json

Large diffs are not rendered by default.

1,420 changes: 685 additions & 735 deletions e2e/jest/package-lock.json

Large diffs are not rendered by default.

1,642 changes: 793 additions & 849 deletions e2e/min/package-lock.json

Large diffs are not rendered by default.

5,920 changes: 2,611 additions & 3,309 deletions e2e/nx/package-lock.json

Large diffs are not rendered by default.

15 changes: 2 additions & 13 deletions libs/ng-mocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,12 @@
"stub",
"dependency"
],
"funding": "https://github.com/sponsors/satanTime",
"author": {
"name": "Isaac Datlof",
"email": "[email protected]",
"url": "https://github.com/ike18t"
},
"contributors": [
{
"name": "Isaac Datlof",
"email": "[email protected]",
"url": "https://github.com/ike18t"
},
{
"name": "satanTime",
"email": "[email protected]",
"url": "https://sudo.eu"
}
],
"maintainers": [
{
"name": "Isaac Datlof",
Expand All @@ -49,7 +38,7 @@
{
"name": "satanTime",
"email": "[email protected]",
"url": "https://sudo.eu"
"url": "https://github.com/satanTime"
}
],
"repository": {
Expand Down
4 changes: 3 additions & 1 deletion libs/ng-mocks/src/lib/mock-builder/mock-builder.promise.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,9 @@ export class MockBuilderPromise implements IMockBuilder {
}

private setConfigDef(def: any, config: any): void {
this.configDef.set(def, config ?? this.configDefault);
if (config || !this.configDef.has(def)) {
this.configDef.set(def, config ?? this.configDefault);
}
}

private setDefValue(def: any, mock: any): void {
Expand Down
Loading

0 comments on commit 33a88c6

Please sign in to comment.