Skip to content

Commit 736a63b

Browse files
authored
Merge branch 'master' into mpopov/pane-bg-color
2 parents edfa614 + 1c417db commit 736a63b

File tree

5 files changed

+6
-125
lines changed

5 files changed

+6
-125
lines changed

package-lock.json

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

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,11 @@
112112
"igniteui-sassdoc-theme": "^1.1.4",
113113
"jasmine": "~3.6.0",
114114
"jasmine-core": "~3.6.0",
115-
"jasmine-spec-reporter": "~5.0.2",
116115
"karma": "^6.3.7",
117116
"karma-chrome-launcher": "~3.1.0",
118117
"karma-coverage": "^2.0.3",
119118
"karma-jasmine": "~3.3.0",
120-
"karma-jasmine-html-reporter": "~1.5.4",
121119
"karma-jasmine-spec-tags": "~1.3.0",
122-
"karma-junit-reporter": "~2.0.1",
123-
"karma-spec-reporter": "~0.0.32",
124120
"lunr": "^2.3.8",
125121
"ng-packagr": "^13.0.0",
126122
"pngcrush": "^2.0.1",

projects/igniteui-angular/karma.conf.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ module.exports = function (config) {
1717
require('karma-coverage'),
1818
require('karma-chrome-launcher'),
1919
require('karma-jasmine-spec-tags'),
20-
require('karma-jasmine-html-reporter'),
21-
require('karma-spec-reporter'),
2220
require('@angular-devkit/build-angular/plugins/karma')
2321
],
2422
parallelOptions: {
@@ -41,20 +39,10 @@ module.exports = function (config) {
4139
subdir: '.',
4240
reporters: [
4341
// reporters not supporting the `file` property
44-
{ type: 'html' },
45-
{ type: 'json' },
46-
{ type: 'lcovonly' },
42+
{ type: 'lcov' },
4743
]
4844
},
4945
reporters: ['progress', 'coverage'],
50-
specReporter: {
51-
suppressSkipped: true,
52-
suppressErrorSummary: false,
53-
suppressFailed: false,
54-
suppressPassed: false,
55-
showSpecTiming: false,
56-
failFast: false
57-
},
5846
port: 9876,
5947
colors: true,
6048
logLevel: config.LOG_INFO,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ describe('IgxTimePicker', () => {
248248
expect(inputGroupFocusedSpy).toHaveBeenCalledTimes(2);
249249
expect(inputGroupRequiredSet).toHaveBeenCalledTimes(1);
250250
expect(inputGroupRequiredSet).toHaveBeenCalledWith(true);
251-
console.log(inputGroupRequiredSet.calls);
251+
252252
inputGroupRequiredGet.and.returnValue(true);
253253

254254
mockNgControl.statusChanges.emit();

projects/igniteui-angular/src/lib/tree/tree.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ describe('IgxTree #treeView', () => {
9595
mockNodesArray.push(
9696
mockNode
9797
);
98-
console.log(mockNodesArray);
99-
console.log(mockNodesArray[0]);
98+
10099
spyOnProperty(mockNodes, 'first', 'get').and.returnValue(mockNode);
101100
tree.ngAfterViewInit();
102101
tick();

0 commit comments

Comments
 (0)