Skip to content

Commit 282440e

Browse files
committed
chore(*): fixing coverage
1 parent 571209b commit 282440e

17 files changed

+23
-21
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ before_script:
1717
# more heap mem per https://github.com/angular/angular-cli/issues/12645, https://github.com/npm/npm/issues/12238#issuecomment-367147962
1818
- export NODE_OPTIONS="--max_old_space_size=4096"
1919
- npm install -g gulp
20+
- npm install -g istanbul-combine
2021
script:
2122
- npm run lint:lib
2223
- ng build igniteui-angular --prod
@@ -25,6 +26,7 @@ script:
2526
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:grid; fi
2627
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:tgrid; fi
2728
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:hgrid; fi
29+
- if [ -z "${TRAVIS_TAG}" ]; then istanbul-combine -d coverage -p none -r lcov -r html coverage/hierarchical-grid/coverage-final.json coverage/tree-grid/coverage-final.json coverage/non-grid/coverage-final.json coverage/grid/coverage-final.json; fi
2830
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:schematics; fi
2931
- if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi
3032

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ module.exports = function (config) {
2929
tags: 'grid'
3030
},
3131
coverageIstanbulReporter: {
32-
dir: require('path').join(__dirname, '../../coverage'),
33-
reports: ['html', 'lcovonly'],
32+
dir: require('path').join(__dirname, '../../coverage/grid'),
33+
reports: ['html', 'json', 'lcovonly'],
3434
fixWebpackSourcePaths: true
3535
},
3636
reporters: ['spec'],

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ module.exports = function (config) {
2929
tags: 'hGrid'
3030
},
3131
coverageIstanbulReporter: {
32-
dir: require('path').join(__dirname, '../../coverage'),
33-
reports: ['html', 'lcovonly'],
32+
dir: require('path').join(__dirname, '../../coverage/hierarchical-grid'),
33+
reports: ['html', 'json', 'lcovonly'],
3434
fixWebpackSourcePaths: true
3535
},
3636
reporters: ['spec'],

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ module.exports = function (config) {
2929
skipTags: 'hGrid,tGrid,grid'
3030
},
3131
coverageIstanbulReporter: {
32-
dir: require('path').join(__dirname, '../../coverage'),
33-
reports: ['html', 'lcovonly'],
32+
dir: require('path').join(__dirname, '../../coverage/non-grid'),
33+
reports: ['html', 'json', 'lcovonly'],
3434
fixWebpackSourcePaths: true
3535
},
3636
reporters: ['spec'],

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ module.exports = function (config) {
2929
tags: 'tGrid'
3030
},
3131
coverageIstanbulReporter: {
32-
dir: require('path').join(__dirname, '../../coverage'),
33-
reports: ['html', 'lcovonly'],
32+
dir: require('path').join(__dirname, '../../coverage/tree-grid'),
33+
reports: ['html', 'json', 'lcovonly'],
3434
fixWebpackSourcePaths: true
3535
},
3636
reporters: ['spec'],

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const DEBOUNCETIME = 30;
1414
const CELL_CSS_CLASS = '.igx-grid__td';
1515

1616

17-
describe('IgxTreeGrid - CRUD #tgrid', () => {
17+
describe('IgxTreeGrid - CRUD #tGrid', () => {
1818
configureTestSuite();
1919
let fix;
2020
let treeGrid: IgxTreeGridComponent;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { first } from 'rxjs/operators';
1515
import { wait } from '../../test-utils/ui-interactions.spec';
1616
import { resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec';
1717

18-
describe('IgxTreeGrid - Expanding / Collapsing #tgrid', () => {
18+
describe('IgxTreeGrid - Expanding / Collapsing #tGrid', () => {
1919
configureTestSuite();
2020
let fix;
2121
let treeGrid;
@@ -1096,7 +1096,7 @@ describe('IgxTreeGrid - Expanding / Collapsing #tgrid', () => {
10961096

10971097
});
10981098

1099-
describe('Row editing expanding/collapsing #tgrid', () => {
1099+
describe('Row editing expanding/collapsing #tGrid', () => {
11001100
configureTestSuite();
11011101
let fix;
11021102
let treeGrid;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { TreeGridFunctions } from '../../test-utils/tree-grid-functions.spec';
77
import { configureTestSuite } from '../../test-utils/configure-suite';
88
import { IgxStringFilteringOperand, IgxNumberFilteringOperand, IgxDateFilteringOperand } from '../../data-operations/filtering-condition';
99

10-
describe('IgxTreeGrid - Filtering actions #tgrid', () => {
10+
describe('IgxTreeGrid - Filtering actions #tGrid', () => {
1111
configureTestSuite();
1212
let fix;
1313
let grid;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { DropPosition } from '../grid';
1111
import { configureTestSuite } from '../../test-utils/configure-suite';
1212
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
1313

14-
describe('IgxTreeGrid - Indentation #tgrid', () => {
14+
describe('IgxTreeGrid - Indentation #tGrid', () => {
1515
configureTestSuite();
1616
let fix;
1717
let treeGrid: IgxTreeGridComponent;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { IgxGridCellComponent } from '../grid';
2424
const CSS_CLASS_BANNER = 'igx-banner';
2525
const CSS_CLASS_ROW_EDITED = 'igx-grid__tr--edited';
2626

27-
describe('IgxTreeGrid - Integration #tgrid', () => {
27+
describe('IgxTreeGrid - Integration #tGrid', () => {
2828
configureTestSuite();
2929
let fix;
3030
let treeGrid: IgxTreeGridComponent;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { setupGridScrollDetection } from '../../test-utils/helper-utils.spec';
1010
const DEBOUNCETIME = 30;
1111
const treeColumns = ['ID', 'Name', 'HireDate', 'Age', 'OnPTO'];
1212

13-
describe('IgxTreeGrid - Key Board Navigation #tgrid', () => {
13+
describe('IgxTreeGrid - Key Board Navigation #tGrid', () => {
1414
let fix;
1515
let treeGrid: IgxTreeGridComponent;
1616

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { IgxTreeGridModule } from '.';
1212
import { HelperUtils, setupGridScrollDetection } from '../../test-utils/helper-utils.spec';
1313
import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';
1414

15-
describe('IgxTreeGrid - Multi Cell selection #tgrid', () => {
15+
describe('IgxTreeGrid - Multi Cell selection #tGrid', () => {
1616
configureTestSuite();
1717

1818
beforeEach(async(() => {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec';
1616
const HIGHLIGHT_CLASS = 'igx-highlight';
1717
const ACTIVE_CLASS = 'igx-highlight__active';
1818

19-
describe('IgxTreeGrid - search API #tgrid', () => {
19+
describe('IgxTreeGrid - search API #tGrid', () => {
2020
configureTestSuite();
2121
let fix;
2222
let fixNativeElement;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { IgxStringFilteringOperand, IgxNumberFilteringOperand } from '../../data
1919
import { configureTestSuite } from '../../test-utils/configure-suite';
2020
import { wait } from '../../test-utils/ui-interactions.spec';
2121

22-
describe('IgxTreeGrid - Selection #tgrid', () => {
22+
describe('IgxTreeGrid - Selection #tGrid', () => {
2323
configureTestSuite();
2424
let fix;
2525
let treeGrid: IgxTreeGridComponent;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { configureTestSuite } from '../../test-utils/configure-suite';
88
import { DefaultSortingStrategy } from '../../data-operations/sorting-strategy';
99
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
1010

11-
describe('IgxTreeGrid - Sorting #tgrid', () => {
11+
describe('IgxTreeGrid - Sorting #tGrid', () => {
1212
configureTestSuite();
1313
let fix;
1414
let treeGrid: IgxTreeGridComponent;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec';
1515
import { IgxNumberFilteringOperand } from 'igniteui-angular';
1616
import { IgxTreeGridRowComponent } from './tree-grid-row.component';
1717

18-
describe('IgxTreeGrid - Summaries #tgrid', () => {
18+
describe('IgxTreeGrid - Summaries #tGrid', () => {
1919
configureTestSuite();
2020
const DEBOUNCETIME = 30;
2121

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
} from '../../test-utils/tree-grid-components.spec';
1414
import { wait } from '../../test-utils/ui-interactions.spec';
1515

16-
describe('IgxTreeGrid Component Tests #tgrid', () => {
16+
describe('IgxTreeGrid Component Tests #tGrid', () => {
1717
configureTestSuite();
1818
const TBODY_CLASS = '.igx-grid__tbody-content';
1919
let fix;

0 commit comments

Comments
 (0)