Skip to content

Commit ac4c3e7

Browse files
committed
feat(pivot-grid): Add tests for predefined date dimension. Add test configs and small fixes.
1 parent 0c4eeca commit ac4c3e7

File tree

6 files changed

+586
-20
lines changed

6 files changed

+586
-20
lines changed

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
"test:lib:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.grid.conf.js",
1616
"test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",
1717
"test:lib:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.hierarchical-grid.conf.js",
18+
"test:lib:pgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.pivot-grid.conf.js",
1819
"test:lib:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.non-grid.conf.js",
1920
"test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js",
2021
"test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js",
2122
"test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js",
23+
"test:lib:azure:pgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.pivot-grid.conf.js",
2224
"test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js",
2325
"test:lib:watch": "ng test igniteui-angular --karma-config=./projects/igniteui-angular/karma.watch.conf.js",
2426
"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",
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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', 'jasmine-spec-tags', '@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+
require('karma-parallel'),
16+
require('karma-jasmine'),
17+
require('karma-chrome-launcher'),
18+
require('karma-jasmine-spec-tags'),
19+
require('@angular-devkit/build-angular/plugins/karma')
20+
],
21+
parallelOptions: {
22+
executors: 2,
23+
shardStrategy: 'round-robin'
24+
},
25+
client: {
26+
clearContext: false, // leave Jasmine Spec Runner output visible in browser
27+
jasmine: {
28+
random: false
29+
},
30+
tagPrefix: '#',
31+
tags: 'pivotGrid'
32+
},
33+
port: 9876,
34+
colors: true,
35+
logLevel: config.LOG_INFO,
36+
autoWatch: true,
37+
browsers: ['ChromeHeadlessNoSandbox'],
38+
customLaunchers: {
39+
ChromeHeadlessNoSandbox: {
40+
base: 'ChromeHeadless',
41+
flags: ['--no-sandbox', '--disable-gpu'],
42+
debug: false
43+
}
44+
},
45+
singleRun: true
46+
});
47+
};
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
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', 'jasmine-spec-tags', '@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+
require('karma-parallel'),
16+
require('karma-jasmine'),
17+
require('karma-coverage'),
18+
require('karma-chrome-launcher'),
19+
require('karma-jasmine-spec-tags'),
20+
require('karma-jasmine-html-reporter'),
21+
require('karma-spec-reporter'),
22+
require('@angular-devkit/build-angular/plugins/karma')
23+
],
24+
parallelOptions: {
25+
executors: 2,
26+
shardStrategy: 'round-robin'
27+
},
28+
client: {
29+
clearContext: false, // leave Jasmine Spec Runner output visible in browser
30+
jasmine: {
31+
random: false
32+
},
33+
tagPrefix: '#',
34+
tags: 'pivotGrid'
35+
},
36+
preprocessors: {
37+
'projects/igniteui-angular/**/*.js': ['coverage']
38+
},
39+
coverageReporter: {
40+
dir: require('path').join(__dirname, '../../coverage/grid'),
41+
reporters: [
42+
// reporters not supporting the `file` property
43+
{ type: 'html' },
44+
{ type: 'json' },
45+
{ type: 'lcovonly' },
46+
]
47+
},
48+
reporters: ['progress', 'coverage'],
49+
specReporter: {
50+
suppressSkipped: true,
51+
suppressErrorSummary: false,
52+
suppressFailed: false,
53+
suppressPassed: false,
54+
showSpecTiming: false,
55+
failFast: false
56+
},
57+
port: 9876,
58+
colors: true,
59+
logLevel: config.LOG_INFO,
60+
autoWatch: true,
61+
browsers: ['ChromeHeadlessNoSandbox'],
62+
customLaunchers: {
63+
ChromeHeadlessNoSandbox: {
64+
base: 'ChromeHeadless',
65+
flags: ['--no-sandbox', '--disable-gpu'],
66+
debug: false
67+
}
68+
},
69+
singleRun: false
70+
});
71+
};

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-dimensions.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ export class IgxPivotDateDimension implements IPivotDimension {
7777

7878
/**
7979
* Creates additional pivot date dimensions based on a provided dimension describing date data:
80+
*
8081
* @param inDateDimension Base dimension that is used by this class to determine the other dimensions and their values.
8182
* @param inOptions Options for the predefined date dimensions whether to show quarter, years and etc.
8283
* @example
@@ -136,7 +137,5 @@ export class IgxPivotDateDimension implements IPivotDimension {
136137
}
137138

138139
/** @hidden @internal */
139-
public memberFunction = (data) => {
140-
return this.resourceStrings.igx_grid_pivot_date_dimension_total;
141-
}
140+
public memberFunction = (data) => this.resourceStrings.igx_grid_pivot_date_dimension_total;
142141
}

0 commit comments

Comments
 (0)