Skip to content

Commit 8f8b95a

Browse files
authored
Merge pull request #6805 from IgniteUI/nrobakova/update-travis-to-use-ivy-90
Update azure to use Ivy false and Travis to use ivy true
2 parents 3e4035c + 3cea497 commit 8f8b95a

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",
1616
"test:lib:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.hierarchical-grid.conf.js",
1717
"test:lib:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.non-grid.conf.js",
18-
"test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js",
19-
"test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js",
20-
"test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js",
21-
"test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js",
18+
"test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
19+
"test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
20+
"test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
21+
"test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
2222
"test:lib:watch": "ng test igniteui-angular",
2323
"test:schematics": "ts-node --project projects/igniteui-angular/migrations/tsconfig.json ./node_modules/jasmine/bin/jasmine.js ./projects/igniteui-angular/migrations/**/*.spec.ts ./projects/igniteui-angular/schematics/**/*.spec.ts",
2424
"build:lib": "ng build igniteui-angular --prod && gulp buildStyle",

projects/igniteui-angular/src/lib/directives/text-selection/text-selection.directive.spec.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ describe('IgxSelection', () => {
5656
const template = ` <input type="text" [igxTextSelection]="false" #select="igxTextSelection"
5757
(click)="select.trigger()" value="Some custom value!" />`;
5858

59-
TestBed.overrideComponent(TriggerTextSelectionOnClickComponent, {
60-
set: {
61-
template
62-
}
63-
});
59+
TestBed.overrideTemplateUsingTestingModule(TriggerTextSelectionOnClickComponent, template);
6460

6561
TestBed.compileComponents().then(() => {
6662
const fix = TestBed.createComponent(TriggerTextSelectionOnClickComponent);

projects/igniteui-angular/src/lib/test-utils/configure-suite.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const configureTestSuite = () => {
1111
let originReset;
1212
beforeAll(() => {
1313
originReset = TestBed.resetTestingModule;
14-
TestBed.resetTestingModule();
14+
// TestBed.resetTestingModule();
1515
TestBed.resetTestingModule = () => TestBed;
1616
resizeObserverIgnoreError();
1717
});
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig.spec.json",
3+
"angularCompilerOptions": {
4+
"enableIvy": false
5+
}
6+
}

projects/igniteui-angular/tsconfig.spec.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
"hammerjs"
1010
]
1111
},
12-
"angularCompilerOptions": {
13-
"enableIvy": false
14-
},
1512
"files": [
1613
"src/test.ts"
1714
],

0 commit comments

Comments
 (0)