Skip to content

Commit 6d0e8bb

Browse files
authored
Merge branch 'master' into pbozhinov/avatar-docs-annotations
2 parents 652ada5 + 4b93e65 commit 6d0e8bb

File tree

10 files changed

+2905
-2694
lines changed

10 files changed

+2905
-2694
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/grids/grid-base.directive.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
227227

228228
/**
229229
* Gets/Sets whether to autogenerate the columns.
230-
*@remarks
231-
* The default value is false.
230+
* @remarks
231+
* The default value is false. When set to true, it will override all columns declared through code or in markup.
232232
* @example
233233
* ```html
234234
* <igx-grid [data]="Data" [autoGenerate]="true"></igx-grid>

projects/igniteui-angular/src/lib/grids/grid/grid-mrl-keyboard-nav.spec.ts

Lines changed: 2865 additions & 2677 deletions
Large diffs are not rendered by default.

projects/igniteui-angular/src/lib/slider/slider.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1644,7 +1644,7 @@ describe('IgxSlider', () => {
16441644
@Component({
16451645
selector: 'igx-slider-rtl',
16461646
template: `
1647-
<igx-slider [value]="value" [type]="type"></igx-slider>
1647+
<igx-slider [type]="type" [value]="value"></igx-slider>
16481648
`
16491649
})
16501650
export class SliderRtlComponent {

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
});

projects/igniteui-angular/src/lib/test-utils/grid-functions.spec.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1606,6 +1606,30 @@ export class GridFunctions {
16061606
const expandInd = GridFunctions.getColGroupExpandIndicator(groupHeader);
16071607
expandInd.dispatchEvent(new Event('click', {}));
16081608
}
1609+
1610+
public static simulateCellKeydown(cellComp: IgxGridCellComponent, keyName: string,
1611+
altKey = false, shiftKey = false, ctrlKey = false) {
1612+
const keyboardEvent = new KeyboardEvent('keydown', {
1613+
key: keyName,
1614+
shiftKey: shiftKey,
1615+
ctrlKey: ctrlKey,
1616+
altKey: altKey
1617+
});
1618+
cellComp.dispatchEvent(keyboardEvent);
1619+
cellComp.onBlur();
1620+
}
1621+
1622+
public static simulateGroupRowKeydown(rowComp: IgxGridGroupByRowComponent, keyName: string,
1623+
altKey = false, shiftKey = false, ctrlKey = false) {
1624+
const keyboardEvent = new KeyboardEvent('keydown', {
1625+
key: keyName,
1626+
shiftKey: shiftKey,
1627+
ctrlKey: ctrlKey,
1628+
altKey: altKey
1629+
});
1630+
rowComp.onKeydown(keyboardEvent);
1631+
rowComp.onBlur();
1632+
}
16091633
}
16101634
export class GridSummaryFunctions {
16111635
public static verifyColumnSummariesBySummaryRowIndex(fix, rowIndex: number, summaryIndex: number, summaryLabels, summaryResults) {

projects/igniteui-angular/src/lib/test-utils/helper-utils.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DebugElement, NgZone, Injectable, EventEmitter } from '@angular/core';
1+
import { DebugElement, EventEmitter, NgZone, Injectable } from '@angular/core';
22
import { By } from '@angular/platform-browser';
33
import { IgxCheckboxComponent } from '../checkbox/checkbox.component';
44
import { ComponentFixture } from '@angular/core/testing';
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)