Skip to content

Commit dbafa48

Browse files
authored
Merge branch '8.2.x' into dmdimitrov/issue7343-8.2.x
2 parents 99f2fb2 + 02d55ea commit dbafa48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+79
-76
lines changed

projects/igniteui-angular/karma.azure.grid.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module.exports = function (config) {
3636
},
3737
reporters: ['junit'],
3838
junitReporter: {
39-
outputDir: ''
39+
outputDir: ''
4040
},
4141
port: 9876,
4242
colors: true,

projects/igniteui-angular/karma.azure.non-grid.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module.exports = function (config) {
3535
},
3636
reporters: ['junit'],
3737
junitReporter: {
38-
outputDir: ''
38+
outputDir: ''
3939
},
4040
port: 9876,
4141
colors: true,

projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,6 @@
388388
}
389389

390390
%form-group-display--disabled {
391-
pointer-events: none;
392391
user-select: none;
393392
color: --var($theme, 'disabled-text-color');
394393
}

projects/igniteui-angular/src/lib/date-picker/date-picker.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,7 @@ describe('IgxDatePicker', () => {
12981298

12991299
expect(inputDirective.valid).toEqual(IgxInputState.INITIAL);
13001300

1301-
inputDirectiveElement.triggerEventHandler('focus', {});
1301+
inputDirectiveElement.triggerEventHandler('focus', { target: { value: ''}});
13021302
fixture.detectChanges();
13031303

13041304
expect(inputDirective.valid).toEqual(IgxInputState.INITIAL);

projects/igniteui-angular/src/lib/grids/grid/cell.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('IgxGrid - Cell component #grid', () => {
1414

1515
const CELL_CSS_CLASS = '.igx-grid__td';
1616

17-
beforeEach(async(() => {
17+
beforeAll(async(() => {
1818
TestBed.configureTestingModule({
1919
declarations: [
2020
DefaultGridComponent,

projects/igniteui-angular/src/lib/grids/grid/column-group.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const GRID_COL_THEAD_CLASS = '.igx-grid__th';
2121
describe('IgxGrid - multi-column headers #grid', () => {
2222
configureTestSuite();
2323

24-
beforeEach(async(() => {
24+
beforeAll(async(() => {
2525
TestBed.configureTestingModule({
2626
declarations: [
2727
OneGroupOneColGridComponent,

projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('Column Hiding UI #grid', () => {
3232
const verifyColumnIsHidden = GridFunctions.verifyColumnIsHidden;
3333
const getColumnHidingButton = GridFunctions.getColumnHidingButton;
3434

35-
beforeEach(async(() => {
35+
beforeAll(async(() => {
3636
TestBed.configureTestingModule({
3737
declarations: [
3838
ColumnHidingTestComponent,

projects/igniteui-angular/src/lib/grids/grid/column-moving.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('IgxGrid - Column Moving #grid', () => {
2828

2929
let fixture, grid: IgxGridComponent;
3030

31-
beforeEach(async(() => {
31+
beforeAll(async(() => {
3232
TestBed.configureTestingModule({
3333
declarations: [
3434
MovableColumnsComponent,

projects/igniteui-angular/src/lib/grids/grid/column-pinning.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('Column Pinning UI #grid', () => {
2525
const verifyCheckbox = HelperUtils.verifyCheckbox;
2626
const verifyColumnIsPinned = GridFunctions.verifyColumnIsPinned;
2727

28-
beforeEach(async(() => {
28+
beforeAll(async(() => {
2929
TestBed.configureTestingModule({
3030
declarations: [
3131
ColumnPinningTestComponent,

projects/igniteui-angular/src/lib/grids/grid/column-resizing.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('IgxGrid - Deferred Column Resizing #grid', () => {
2222
const COLUMN_HEADER_GROUP_CLASS = '.igx-grid__thead-item';
2323
const COLUMN_FILTER_CELL_SELECTOR = 'igx-grid-filtering-cell';
2424

25-
beforeEach(async(() => {
25+
beforeAll(async(() => {
2626
TestBed.configureTestingModule({
2727
declarations: [
2828
ResizableColumnsComponent,

0 commit comments

Comments
 (0)