Skip to content

Commit ea062ec

Browse files
devversiondevversion
committed
Move karma system config into separate file
1 parent 0df6e6c commit ea062ec

File tree

4 files changed

+121
-127
lines changed

4 files changed

+121
-127
lines changed

‎test/karma-system-config.js

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
// Configure the base path and map the different node packages.
2+
System.config({
3+
baseURL: '/base',
4+
paths: {
5+
'node:*': 'node_modules/*'
6+
},
7+
map: {
8+
'rxjs': 'node:rxjs',
9+
'tslib': 'node:tslib/tslib.js',
10+
'moment': 'node:moment/min/moment-with-locales.min.js',
11+
12+
// Angular specific mappings.
13+
'@angular/core': 'node:@angular/core/bundles/core.umd.js',
14+
'@angular/core/testing': 'node:@angular/core/bundles/core-testing.umd.min.js',
15+
'@angular/common': 'node:@angular/common/bundles/common.umd.min.js',
16+
'@angular/common/testing': 'node:@angular/common/bundles/common-testing.umd.min.js',
17+
'@angular/common/http': 'node:@angular/common/bundles/common-http.umd.min.js',
18+
'@angular/common/http/testing': 'node:@angular/common/bundles/common-http-testing.umd.min.js',
19+
'@angular/compiler': 'node:@angular/compiler/bundles/compiler.umd.min.js',
20+
'@angular/compiler/testing': 'node:@angular/compiler/bundles/compiler-testing.umd.min.js',
21+
'@angular/forms': 'node:@angular/forms/bundles/forms.umd.min.js',
22+
'@angular/forms/testing': 'node:@angular/forms/bundles/forms-testing.umd.min.js',
23+
'@angular/animations': 'node:@angular/animations/bundles/animations.umd.min.js',
24+
'@angular/animations/browser': 'node:@angular/animations/bundles/animations-browser.umd.min.js',
25+
'@angular/platform-browser/animations':
26+
'node:@angular/platform-browser/bundles/platform-browser-animations.umd.min.js',
27+
'@angular/platform-browser':
28+
'node:@angular/platform-browser/bundles/platform-browser.umd.min.js',
29+
'@angular/platform-browser/testing':
30+
'node:@angular/platform-browser/bundles/platform-browser-testing.umd.min.js',
31+
'@angular/platform-browser-dynamic':
32+
'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.min.js',
33+
'@angular/platform-browser-dynamic/testing':
34+
'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.min.js',
35+
36+
// Path mappings for local packages that can be imported inside of tests.
37+
// TODO(devversion): replace once the index.ts file for the Material package has been added.
38+
'@angular/material': 'dist/packages/material/public-api.js',
39+
'@angular/material-experimental': 'dist/packages/material-experimental/index.js',
40+
'@angular/cdk-experimental': 'dist/packages/cdk-experimental/index.js',
41+
42+
'@angular/cdk': 'dist/packages/cdk/index.js',
43+
'@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
44+
'@angular/cdk/accordion': 'dist/packages/cdk/accordion/index.js',
45+
'@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
46+
'@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
47+
'@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
48+
'@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
49+
'@angular/cdk/layout': 'dist/packages/cdk/layout/index.js',
50+
'@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
51+
'@angular/cdk/overlay': 'dist/packages/cdk/overlay/index.js',
52+
'@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',
53+
'@angular/cdk/portal': 'dist/packages/cdk/portal/index.js',
54+
'@angular/cdk/scrolling': 'dist/packages/cdk/scrolling/index.js',
55+
'@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
56+
'@angular/cdk/table': 'dist/packages/cdk/table/index.js',
57+
'@angular/cdk/testing': 'dist/packages/cdk/testing/index.js',
58+
'@angular/cdk/text-field': 'dist/packages/cdk/text-field/index.js',
59+
'@angular/cdk/tree': 'dist/packages/cdk/tree/index.js',
60+
61+
'@angular/cdk-experimental/scrolling': 'dist/packages/cdk-experimental/scrolling/index.js',
62+
'@angular/cdk-experimental/dialog': 'dist/packages/cdk-experimental/dialog/index.js',
63+
'@angular/cdk-experimental/drag-drop':
64+
'dist/packages/cdk-experimental/drag-drop/index.js',
65+
66+
'@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
67+
'@angular/material/badge': 'dist/packages/material/badge/index.js',
68+
'@angular/material/bottom-sheet': 'dist/packages/material/bottom-sheet/index.js',
69+
'@angular/material/button': 'dist/packages/material/button/index.js',
70+
'@angular/material/button-toggle': 'dist/packages/material/button-toggle/index.js',
71+
'@angular/material/card': 'dist/packages/material/card/index.js',
72+
'@angular/material/checkbox': 'dist/packages/material/checkbox/index.js',
73+
'@angular/material/chips': 'dist/packages/material/chips/index.js',
74+
'@angular/material/core': 'dist/packages/material/core/index.js',
75+
'@angular/material/datepicker': 'dist/packages/material/datepicker/index.js',
76+
'@angular/material/dialog': 'dist/packages/material/dialog/index.js',
77+
'@angular/material/divider': 'dist/packages/material/divider/index.js',
78+
'@angular/material/expansion': 'dist/packages/material/expansion/index.js',
79+
'@angular/material/form-field': 'dist/packages/material/form-field/index.js',
80+
'@angular/material/grid-list': 'dist/packages/material/grid-list/index.js',
81+
'@angular/material/icon': 'dist/packages/material/icon/index.js',
82+
'@angular/material/input': 'dist/packages/material/input/index.js',
83+
'@angular/material/list': 'dist/packages/material/list/index.js',
84+
'@angular/material/menu': 'dist/packages/material/menu/index.js',
85+
'@angular/material/paginator': 'dist/packages/material/paginator/index.js',
86+
'@angular/material/progress-bar': 'dist/packages/material/progress-bar/index.js',
87+
'@angular/material/progress-spinner': 'dist/packages/material/progress-spinner/index.js',
88+
'@angular/material/radio': 'dist/packages/material/radio/index.js',
89+
'@angular/material/select': 'dist/packages/material/select/index.js',
90+
'@angular/material/sidenav': 'dist/packages/material/sidenav/index.js',
91+
'@angular/material/slide-toggle': 'dist/packages/material/slide-toggle/index.js',
92+
'@angular/material/slider': 'dist/packages/material/slider/index.js',
93+
'@angular/material/snack-bar': 'dist/packages/material/snack-bar/index.js',
94+
'@angular/material/sort': 'dist/packages/material/sort/index.js',
95+
'@angular/material/stepper': 'dist/packages/material/stepper/index.js',
96+
'@angular/material/table': 'dist/packages/material/table/index.js',
97+
'@angular/material/tabs': 'dist/packages/material/tabs/index.js',
98+
'@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
99+
'@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
100+
'@angular/material/tree': 'dist/packages/material/tree/index.js',
101+
},
102+
packages: {
103+
// Thirdparty barrels.
104+
'rxjs': {main: 'index'},
105+
'rxjs/operators': {main: 'index'},
106+
107+
// Set the default extension for the root package, because otherwise the demo-app can't
108+
// be built within the production mode. Due to missing file extensions.
109+
'.': {
110+
defaultExtension: 'js'
111+
}
112+
}
113+
});

‎test/karma-test-shim.js

Lines changed: 0 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -8,124 +8,8 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
88

99
__karma__.loaded = function () {};
1010

11-
var baseDir = '/base';
1211
var specFiles = Object.keys(window.__karma__.files).filter(isMaterialSpecFile);
1312

14-
// Configure the base path and map the different node packages.
15-
System.config({
16-
baseURL: baseDir,
17-
paths: {
18-
'node:*': 'node_modules/*'
19-
},
20-
map: {
21-
'rxjs': 'node:rxjs',
22-
'main': 'main.js',
23-
'tslib': 'node:tslib/tslib.js',
24-
'moment': 'node:moment/min/moment-with-locales.min.js',
25-
26-
// Angular specific mappings.
27-
'@angular/core': 'node:@angular/core/bundles/core.umd.js',
28-
'@angular/core/testing': 'node:@angular/core/bundles/core-testing.umd.js',
29-
'@angular/common': 'node:@angular/common/bundles/common.umd.js',
30-
'@angular/common/testing': 'node:@angular/common/bundles/common-testing.umd.js',
31-
'@angular/common/http': 'node:@angular/common/bundles/common-http.umd.js',
32-
'@angular/common/http/testing': 'node:@angular/common/bundles/common-http-testing.umd.js',
33-
'@angular/compiler': 'node:@angular/compiler/bundles/compiler.umd.js',
34-
'@angular/compiler/testing': 'node:@angular/compiler/bundles/compiler-testing.umd.js',
35-
'@angular/forms': 'node:@angular/forms/bundles/forms.umd.js',
36-
'@angular/forms/testing': 'node:@angular/forms/bundles/forms-testing.umd.js',
37-
'@angular/animations': 'node:@angular/animations/bundles/animations.umd.js',
38-
'@angular/animations/browser': 'node:@angular/animations/bundles/animations-browser.umd.js',
39-
'@angular/platform-browser/animations':
40-
'node:@angular/platform-browser/bundles/platform-browser-animations.umd',
41-
'@angular/platform-browser':
42-
'node:@angular/platform-browser/bundles/platform-browser.umd.js',
43-
'@angular/platform-browser/testing':
44-
'node:@angular/platform-browser/bundles/platform-browser-testing.umd.js',
45-
'@angular/platform-browser-dynamic':
46-
'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
47-
'@angular/platform-browser-dynamic/testing':
48-
'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
49-
50-
// Path mappings for local packages that can be imported inside of tests.
51-
// TODO(devversion): replace once the index.ts file for the Material package has been added.
52-
'@angular/material': 'dist/packages/material/public-api.js',
53-
'@angular/material-experimental': 'dist/packages/material-experimental/index.js',
54-
'@angular/cdk-experimental': 'dist/packages/cdk-experimental/index.js',
55-
56-
'@angular/cdk': 'dist/packages/cdk/index.js',
57-
'@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
58-
'@angular/cdk/accordion': 'dist/packages/cdk/accordion/index.js',
59-
'@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
60-
'@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
61-
'@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
62-
'@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
63-
'@angular/cdk/layout': 'dist/packages/cdk/layout/index.js',
64-
'@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
65-
'@angular/cdk/overlay': 'dist/packages/cdk/overlay/index.js',
66-
'@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',
67-
'@angular/cdk/portal': 'dist/packages/cdk/portal/index.js',
68-
'@angular/cdk/scrolling': 'dist/packages/cdk/scrolling/index.js',
69-
'@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
70-
'@angular/cdk/table': 'dist/packages/cdk/table/index.js',
71-
'@angular/cdk/testing': 'dist/packages/cdk/testing/index.js',
72-
'@angular/cdk/text-field': 'dist/packages/cdk/text-field/index.js',
73-
'@angular/cdk/tree': 'dist/packages/cdk/tree/index.js',
74-
75-
'@angular/cdk-experimental/scrolling': 'dist/packages/cdk-experimental/scrolling/index.js',
76-
'@angular/cdk-experimental/dialog': 'dist/packages/cdk-experimental/dialog/index.js',
77-
'@angular/cdk-experimental/drag-drop':
78-
'dist/packages/cdk-experimental/drag-drop/index.js',
79-
80-
'@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
81-
'@angular/material/badge': 'dist/packages/material/badge/index.js',
82-
'@angular/material/bottom-sheet': 'dist/packages/material/bottom-sheet/index.js',
83-
'@angular/material/button': 'dist/packages/material/button/index.js',
84-
'@angular/material/button-toggle': 'dist/packages/material/button-toggle/index.js',
85-
'@angular/material/card': 'dist/packages/material/card/index.js',
86-
'@angular/material/checkbox': 'dist/packages/material/checkbox/index.js',
87-
'@angular/material/chips': 'dist/packages/material/chips/index.js',
88-
'@angular/material/core': 'dist/packages/material/core/index.js',
89-
'@angular/material/datepicker': 'dist/packages/material/datepicker/index.js',
90-
'@angular/material/dialog': 'dist/packages/material/dialog/index.js',
91-
'@angular/material/divider': 'dist/packages/material/divider/index.js',
92-
'@angular/material/expansion': 'dist/packages/material/expansion/index.js',
93-
'@angular/material/form-field': 'dist/packages/material/form-field/index.js',
94-
'@angular/material/grid-list': 'dist/packages/material/grid-list/index.js',
95-
'@angular/material/icon': 'dist/packages/material/icon/index.js',
96-
'@angular/material/input': 'dist/packages/material/input/index.js',
97-
'@angular/material/list': 'dist/packages/material/list/index.js',
98-
'@angular/material/menu': 'dist/packages/material/menu/index.js',
99-
'@angular/material/paginator': 'dist/packages/material/paginator/index.js',
100-
'@angular/material/progress-bar': 'dist/packages/material/progress-bar/index.js',
101-
'@angular/material/progress-spinner': 'dist/packages/material/progress-spinner/index.js',
102-
'@angular/material/radio': 'dist/packages/material/radio/index.js',
103-
'@angular/material/select': 'dist/packages/material/select/index.js',
104-
'@angular/material/sidenav': 'dist/packages/material/sidenav/index.js',
105-
'@angular/material/slide-toggle': 'dist/packages/material/slide-toggle/index.js',
106-
'@angular/material/slider': 'dist/packages/material/slider/index.js',
107-
'@angular/material/snack-bar': 'dist/packages/material/snack-bar/index.js',
108-
'@angular/material/sort': 'dist/packages/material/sort/index.js',
109-
'@angular/material/stepper': 'dist/packages/material/stepper/index.js',
110-
'@angular/material/table': 'dist/packages/material/table/index.js',
111-
'@angular/material/tabs': 'dist/packages/material/tabs/index.js',
112-
'@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
113-
'@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
114-
'@angular/material/tree': 'dist/packages/material/tree/index.js',
115-
},
116-
packages: {
117-
// Thirdparty barrels.
118-
'rxjs': {main: 'index'},
119-
'rxjs/operators': {main: 'index'},
120-
121-
// Set the default extension for the root package, because otherwise the demo-app can't
122-
// be built within the production mode. Due to missing file extensions.
123-
'.': {
124-
defaultExtension: 'js'
125-
}
126-
}
127-
});
128-
12913
// Configure the Angular test bed and run all specs once configured.
13014
configureTestBed()
13115
.then(runMaterialSpecs)

‎test/karma.conf.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ module.exports = (config) => {
1616
require('karma-coverage'),
1717
],
1818
files: [
19-
{pattern: 'node_modules/core-js/client/core.js', included: true, watched: false},
19+
{pattern: 'node_modules/core-js/client/core.min.js', included: true, watched: false},
2020
{pattern: 'node_modules/tslib/tslib.js', included: true, watched: false},
21-
{pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: false},
22-
{pattern: 'node_modules/zone.js/dist/zone.js', included: true, watched: false},
23-
{pattern: 'node_modules/zone.js/dist/proxy.js', included: true, watched: false},
21+
{pattern: 'node_modules/systemjs/dist/system.js', included: true, watched: false},
22+
{pattern: 'node_modules/zone.js/dist/zone.min.js', included: true, watched: false},
23+
{pattern: 'node_modules/zone.js/dist/proxy.min.js', included: true, watched: false},
2424
{pattern: 'node_modules/zone.js/dist/sync-test.js', included: true, watched: false},
25-
{pattern: 'node_modules/zone.js/dist/jasmine-patch.js', included: true, watched: false},
25+
{pattern: 'node_modules/zone.js/dist/jasmine-patch.min.js', included: true, watched: false},
2626
{pattern: 'node_modules/zone.js/dist/async-test.js', included: true, watched: false},
2727
{pattern: 'node_modules/zone.js/dist/fake-async-test.js', included: true, watched: false},
2828
{pattern: 'node_modules/hammerjs/hammer.min.js', included: true, watched: false},
29-
{pattern: 'node_modules/hammerjs/hammer.min.js.map', included: false, watched: false},
3029
{pattern: 'node_modules/moment/min/moment-with-locales.min.js', included: true, watched: false},
3130

3231
// Include all Angular dependencies
3332
{pattern: 'node_modules/@angular/**/*', included: false, watched: false},
3433
{pattern: 'node_modules/rxjs/**/*', included: false, watched: false},
3534

35+
{pattern: 'test/karma-system-config.js', included: true, watched: false},
3636
{pattern: 'test/karma-test-shim.js', included: true, watched: false},
3737

3838
// Include a Material theme in the test suite.
@@ -59,7 +59,7 @@ module.exports = (config) => {
5959
},
6060

6161
sauceLabs: {
62-
testName: 'material2',
62+
testName: 'Angular Material Unit Tests',
6363
startConnect: false,
6464
recordVideo: false,
6565
recordScreenshots: false,
@@ -69,7 +69,7 @@ module.exports = (config) => {
6969
},
7070

7171
browserStack: {
72-
project: 'material2',
72+
project: 'Angular Material Unit Tests',
7373
startTunnel: false,
7474
retryLimit: 1,
7575
timeout: 1800,
@@ -128,7 +128,5 @@ module.exports = (config) => {
128128
// concurrency. Stability is compared to speed more important.
129129
config.concurrency = 1;
130130
config.browsers = platformMap[platform][target.toLowerCase()];
131-
132-
config.logLevel = config.LOG_DEBUG;
133131
}
134132
};

‎test/protractor.conf.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
const fs = require('fs');
21
const path = require('path');
32

43
// Load ts-node to be able to execute TypeScript files with protractor.

0 commit comments

Comments
 (0)