Merge branch 'master' into mpopov/hardcoded-colors

Author: simeonoff

package-lock.json

@@ -112,15 +112,11 @@
     "igniteui-sassdoc-theme": "^1.1.4",
     "jasmine": "~3.6.0",
     "jasmine-core": "~3.6.0",
-    "jasmine-spec-reporter": "~5.0.2",
     "karma": "^6.3.7",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "^2.0.3",
     "karma-jasmine": "~3.3.0",
-    "karma-jasmine-html-reporter": "~1.5.4",
     "karma-jasmine-spec-tags": "~1.3.0",
-    "karma-junit-reporter": "~2.0.1",
-    "karma-spec-reporter": "~0.0.32",
     "lunr": "^2.3.8",
     "ng-packagr": "^13.0.0",
     "pngcrush": "^2.0.1",

package.json

@@ -17,8 +17,6 @@ module.exports = function (config) {
         require('karma-coverage'),
         require('karma-chrome-launcher'),
         require('karma-jasmine-spec-tags'),
-        require('karma-jasmine-html-reporter'),
-        require('karma-spec-reporter'),
         require('@angular-devkit/build-angular/plugins/karma')
     ],
     parallelOptions: {
@@ -41,20 +39,10 @@ module.exports = function (config) {
       subdir: '.',
       reporters: [
         // reporters not supporting the `file` property
-        { type: 'html' },
-        { type: 'json' },
-        { type: 'lcovonly' },
+        { type: 'lcov' },
       ]
     },
     reporters: ['progress', 'coverage'],
-    specReporter: {
-        suppressSkipped: true,
-        suppressErrorSummary: false,
-        suppressFailed: false,
-        suppressPassed: false,
-        showSpecTiming: false,
-        failFast: false
-    },
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

projects/igniteui-angular/karma.conf.js

@@ -59,7 +59,7 @@ $light-chip: extend(
         ),
 
         background: (
-            igx-color: ('grays', 300)
+            igx-color: ('grays', 400, .38)
         ),
 
         border-color: transparent,
@@ -73,7 +73,7 @@ $light-chip: extend(
         ),
 
         hover-background: (
-            igx-color: ('grays', 400, .5)
+            igx-color: ('grays', 400, .54)
         ),
 
         hover-border-color: transparent,
@@ -83,7 +83,7 @@ $light-chip: extend(
         ),
 
         focus-background: (
-            igx-color: ('grays', 400, .5)
+            igx-color: ('grays', 600, .54)
         ),
 
         focus-border-color: transparent,
@@ -93,7 +93,7 @@ $light-chip: extend(
         ),
 
         selected-background: (
-            igx-color: ('grays', 300)
+            igx-color: ('grays', 600, .38)
         ),
 
         selected-border-color: transparent,
@@ -103,7 +103,7 @@ $light-chip: extend(
         ),
 
         hover-selected-background: (
-            igx-color: ('grays', 400, .8)
+            igx-color: ('grays', 400, .54)
         ),
 
         hover-selected-border-color: transparent,
@@ -113,7 +113,7 @@ $light-chip: extend(
         ),
 
         focus-selected-background: (
-            igx-color: ('grays', 400, .8)
+            igx-color: ('grays', 600, .54)
         ),
 
         focus-selected-border-color: transparent

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_chip.scss

@@ -248,7 +248,7 @@ describe('IgxTimePicker', () => {
             expect(inputGroupFocusedSpy).toHaveBeenCalledTimes(2);
             expect(inputGroupRequiredSet).toHaveBeenCalledTimes(1);
             expect(inputGroupRequiredSet).toHaveBeenCalledWith(true);
-            console.log(inputGroupRequiredSet.calls);
+
             inputGroupRequiredGet.and.returnValue(true);
 
             mockNgControl.statusChanges.emit();

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

@@ -95,8 +95,7 @@ describe('IgxTree #treeView', () => {
                 mockNodesArray.push(
                     mockNode
                 );
-                console.log(mockNodesArray);
-                console.log(mockNodesArray[0]);
+
                 spyOnProperty(mockNodes, 'first', 'get').and.returnValue(mockNode);
                 tree.ngAfterViewInit();
                 tick();