Skip to content

Commit fb50e2f

Browse files
authored
Merge pull request #12399 from IgniteUI/tree-grid-tests
test(tree-grid): refactoring selection tests
2 parents 388fdc7 + 021169e commit fb50e2f

File tree

108 files changed

+3010
-3365
lines changed

Some content is hidden

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

108 files changed

+3010
-3365
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ npm-debug.log
3838
yarn-error.log
3939
testem.log
4040
/typings
41+
TESTS-**.xml
4142

4243
# System Files
4344
.DS_Store

azure-pipelines.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ steps:
5858
testRunner: 'JUnit'
5959
testResultsFiles: '**/TESTS-*.xml'
6060

61-
# - task: PublishCodeCoverageResults@1
62-
# inputs:
63-
# codeCoverageTool: Cobertura
64-
# summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml'
65-
# reportDirectory: '$(System.DefaultWorkingDirectory)/coverage'
61+
- task: PublishCodeCoverageResults@1
62+
inputs:
63+
codeCoverageTool: Cobertura
64+
summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml'
65+
reportDirectory: '$(System.DefaultWorkingDirectory)/coverage'

package-lock.json

Lines changed: 139 additions & 337 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"e2e": "ng e2e",
1111
"test:lib": "ng test igniteui-angular --watch=false --no-progress --code-coverage",
1212
"test:lib:perf": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.test-perf.conf.js",
13-
"test:lib:azure": "ng test igniteui-angular --watch=false --no-progress",
13+
"test:lib:azure": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.conf.js",
1414
"test:lib:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.grid.conf.js",
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",
@@ -69,6 +69,7 @@
6969
"hammerjs": "^2.0.8",
7070
"igniteui-theming": "^1.2.0",
7171
"igniteui-trial-watermark": "^1.0.3",
72+
"karma-junit-reporter": "^2.0.1",
7273
"lodash-es": "^4.17.21",
7374
"rxjs": "^6.6.7",
7475
"tslib": "^2.3.0",
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// Karma configuration file, see link for more information
2+
// https://karma-runner.github.io/1.0/config/configuration-file.html
3+
4+
module.exports = function (config) {
5+
config.set({
6+
basePath: '',
7+
frameworks: ['parallel', 'jasmine', '@angular-devkit/build-angular'],
8+
files: [
9+
{ pattern: '../../node_modules/hammerjs/hammer.min.js', watched: false },
10+
{ pattern: '../../node_modules/hammer-simulator/index.js', watched: false },
11+
{ pattern: './test.css', watched: false },
12+
{ pattern: '../../dist/igniteui-angular/styles/igniteui-angular.css', watched: false }
13+
],
14+
plugins: [
15+
'karma-parallel',
16+
'karma-jasmine',
17+
'karma-coverage',
18+
'karma-chrome-launcher',
19+
'karma-spec-reporter',
20+
'karma-junit-reporter',
21+
'@angular-devkit/build-angular/plugins/karma'
22+
],
23+
parallelOptions: {
24+
executors: 2,
25+
shardStrategy: 'round-robin'
26+
},
27+
client: {
28+
//clearContext: false, // leave Jasmine Spec Runner output visible in browser
29+
jasmine: {
30+
random: false
31+
},
32+
tagPrefix: '#',
33+
skipTags: 'perf'
34+
},
35+
coverageReporter: {
36+
dir: require('path').join(__dirname, '../../coverage'),
37+
subdir: '.',
38+
reporters: [
39+
// reporters not supporting the `file` property
40+
{ type: 'cobertura' },
41+
]
42+
},
43+
reporters: ['spec', 'junit'],
44+
port: 9876,
45+
colors: true,
46+
logLevel: config.LOG_INFO,
47+
autoWatch: true,
48+
browsers: ['ChromeHeadlessNoSandbox'],
49+
browserDisconnectTimeout: 4000,
50+
customLaunchers: {
51+
ChromeHeadlessNoSandbox: {
52+
base: 'ChromeHeadless',
53+
flags: ['--no-sandbox', '--disable-gpu'],
54+
debug: false
55+
}
56+
},
57+
singleRun: false
58+
});
59+
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['parallel','jasmine', 'jasmine-spec-tags', '@angular-devkit/build-angular'],
7+
frameworks: ['parallel', 'jasmine', 'jasmine-spec-tags', '@angular-devkit/build-angular'],
88
files: [
99
{ pattern: '../../node_modules/hammerjs/hammer.min.js', watched: false },
1010
{ pattern: '../../node_modules/hammer-simulator/index.js', watched: false },

projects/igniteui-angular/karma.conf.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ module.exports = function (config) {
1212
{ pattern: '../../dist/igniteui-angular/styles/igniteui-angular.css', watched: false }
1313
],
1414
plugins: [
15-
'karma-parallel',
16-
'karma-jasmine',
17-
'karma-coverage',
18-
'karma-chrome-launcher',
19-
'karma-spec-reporter',
20-
'@angular-devkit/build-angular/plugins/karma'
15+
'karma-parallel',
16+
'karma-jasmine',
17+
'karma-coverage',
18+
'karma-chrome-launcher',
19+
'karma-spec-reporter',
20+
'@angular-devkit/build-angular/plugins/karma'
2121
],
2222
parallelOptions: {
2323
executors: 2,
2424
shardStrategy: 'round-robin'
2525
},
2626
client: {
27-
clearContext: false, // leave Jasmine Spec Runner output visible in browser
27+
//clearContext: false, // leave Jasmine Spec Runner output visible in browser
2828
jasmine: {
2929
random: false
3030
},

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.spec.ts

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, ViewChild, OnInit } from '@angular/core';
22
import { IgxActionStripComponent } from '../action-strip.component';
33
import { configureTestSuite } from '../../test-utils/configure-suite';
4-
import { TestBed, fakeAsync, waitForAsync } from '@angular/core/testing';
4+
import { TestBed, waitForAsync } from '@angular/core/testing';
55
import { IgxIconModule } from '../../icon/public_api';
66
import { IgxGridModule, IgxGridComponent } from '../../grids/grid/public_api';
77
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -44,15 +44,13 @@ describe('igxGridEditingActions #grid ', () => {
4444
}).compileComponents();
4545
}));
4646

47-
48-
4947
describe('Base ', () => {
50-
beforeEach(fakeAsync(/** height/width setter rAF */() => {
48+
beforeEach(() => {
5149
fixture = TestBed.createComponent(IgxActionStripTestingComponent);
5250
fixture.detectChanges();
5351
actionStrip = fixture.componentInstance.actionStrip;
5452
grid = fixture.componentInstance.grid;
55-
}));
53+
});
5654

5755
it('should allow editing and deleting row', () => {
5856
let deleteIcon;
@@ -121,12 +119,12 @@ describe('igxGridEditingActions #grid ', () => {
121119
});
122120

123121
describe('Menu ', () => {
124-
beforeEach(fakeAsync(/** height/width setter rAF */() => {
122+
beforeEach(() => {
125123
fixture = TestBed.createComponent(IgxActionStripEditMenuComponent);
126124
fixture.detectChanges();
127125
actionStrip = fixture.componentInstance.actionStrip;
128126
grid = fixture.componentInstance.grid;
129-
}));
127+
});
130128
it('should allow editing and deleting row via menu', async () => {
131129
const row = grid.rowList.toArray()[0];
132130
actionStrip.show(row);
@@ -180,12 +178,12 @@ describe('igxGridEditingActions #grid ', () => {
180178
});
181179

182180
describe('integration with pinning actions ', () => {
183-
beforeEach(fakeAsync(/** height/width setter rAF */() => {
181+
beforeEach(() => {
184182
fixture = TestBed.createComponent(IgxActionStripPinEditComponent);
185183
fixture.detectChanges();
186184
actionStrip = fixture.componentInstance.actionStrip;
187185
grid = fixture.componentInstance.grid;
188-
}));
186+
});
189187
it('should remove editing actions on disabled rows', () => {
190188
grid.rowList.first.pin();
191189
fixture.detectChanges();
@@ -200,12 +198,12 @@ describe('igxGridEditingActions #grid ', () => {
200198
});
201199

202200
describe('auto show/hide', () => {
203-
beforeEach(fakeAsync(/** height/width setter rAF */() => {
201+
beforeEach(() => {
204202
fixture = TestBed.createComponent(IgxActionStripPinEditComponent);
205203
fixture.detectChanges();
206204
actionStrip = fixture.componentInstance.actionStrip;
207205
grid = fixture.componentInstance.grid;
208-
}));
206+
});
209207
it('should auto-show on mouse enter of row.', () => {
210208
const row = grid.gridAPI.get_row_by_index(0);
211209
const rowElem = row.nativeElement;
@@ -249,13 +247,13 @@ describe('igxGridEditingActions #grid ', () => {
249247

250248
describe('auto show/hide in HierarchicalGrid', () => {
251249
let actionStripRoot; let actionStripChild; let hierarchicalGrid: IgxHierarchicalGridComponent;
252-
beforeEach(fakeAsync(/** height/width setter rAF */() => {
250+
beforeEach(() => {
253251
fixture = TestBed.createComponent(IgxHierarchicalGridActionStripComponent);
254252
fixture.detectChanges();
255253
actionStripRoot = fixture.componentInstance.actionStripRoot;
256254
actionStripChild = fixture.componentInstance.actionStripChild;
257255
hierarchicalGrid = fixture.componentInstance.hgrid;
258-
}));
256+
});
259257

260258
it('should auto-show root actionStrip on mouse enter of root row.', () => {
261259
const row = hierarchicalGrid.gridAPI.get_row_by_index(0);

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-pinning-actions.component.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, ViewChild, OnInit } from '@angular/core';
22
import { IgxActionStripComponent } from '../action-strip.component';
33
import { configureTestSuite } from '../../test-utils/configure-suite';
4-
import { TestBed, fakeAsync, waitForAsync } from '@angular/core/testing';
4+
import { TestBed, waitForAsync } from '@angular/core/testing';
55
import { IgxIconModule } from '../../icon/public_api';
66
import { IgxGridModule, IgxGridComponent } from '../../grids/grid/public_api';
77
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -31,12 +31,12 @@ describe('igxGridPinningActions #grid ', () => {
3131
}));
3232

3333
describe('Base ', () => {
34-
beforeEach(fakeAsync(/** height/width setter rAF */() => {
34+
beforeEach(() => {
3535
fixture = TestBed.createComponent(IgxActionStripTestingComponent);
3636
fixture.detectChanges();
3737
actionStrip = fixture.componentInstance.actionStrip;
3838
grid = fixture.componentInstance.grid;
39-
}));
39+
});
4040

4141
it('should allow pinning and unpinning rows in a grid', () => {
4242
actionStrip.show(grid.rowList.first);
@@ -80,12 +80,12 @@ describe('igxGridPinningActions #grid ', () => {
8080
});
8181

8282
describe('Menu ', () => {
83-
beforeEach(fakeAsync(/** height/width setter rAF */() => {
83+
beforeEach(() => {
8484
fixture = TestBed.createComponent(IgxActionStripPinMenuComponent);
8585
fixture.detectChanges();
8686
actionStrip = fixture.componentInstance.actionStrip;
8787
grid = fixture.componentInstance.grid;
88-
}));
88+
});
8989
it('should allow pinning row via menu', async () => {
9090
const row = grid.rowList.toArray()[0];
9191
actionStrip.show(row);

projects/igniteui-angular/src/lib/calendar/calendar-base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IgxCalendarView } from './month-picker-base';
88
import { CurrentResourceStrings } from '../core/i18n/resources';
99
import { ICalendarResourceStrings } from '../core/i18n/calendar-resources';
1010
import { DateTimeUtil } from '../date-common/util/date-time.util';
11-
import { getLocaleFirstDayOfWeek, getLocaleId } from "@angular/common";
11+
import { getLocaleFirstDayOfWeek } from "@angular/common";
1212

1313
/**
1414
* Sets the selection type - single, multi or range.

0 commit comments

Comments
 (0)