Skip to content

Commit b3d3b56

Browse files
test(*): split tests into core, ng1, ng2
chore(*): use npm scripts for karma, not grunt
1 parent 95ae0cf commit b3d3b56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+929
-975
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ before_script:
1010
- ./nodeserver.sh > /dev/null &
1111

1212
script:
13-
- grunt integrate
13+
- npm run test:integrate
1414

1515
sudo: false
1616

config/_karma.base.js

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Karma configuration file
2+
3+
var karma = require("karma");
4+
var files = require('../files').files;
5+
6+
var config = {
7+
8+
singleRun: true,
9+
autoWatch: false,
10+
autoWatchInterval: 0,
11+
12+
// level of logging
13+
// possible values: LOG_DISABLE, LOG_ERROR, LOG_WARN, LOG_INFO, LOG_DEBUG
14+
logLevel: "warn",
15+
// possible values: 'dots', 'progress'
16+
reporters: 'dots',
17+
colors: true,
18+
19+
port: 8080,
20+
21+
// base path, that will be used to resolve files and exclude
22+
basePath: '..',
23+
24+
// Start these browsers, currently available:
25+
// Chrome, ChromeCanary, Firefox, Opera, Safari, PhantomJS
26+
browsers: ['PhantomJS'],
27+
28+
frameworks: ['systemjs', 'jasmine'],
29+
30+
plugins: [
31+
require('karma-systemjs'),
32+
require('karma-jasmine'),
33+
require('karma-phantomjs-launcher'),
34+
require('karma-chrome-launcher')
35+
],
36+
37+
systemjs: {
38+
// Set up systemjs paths
39+
configFile: 'config/system.config.js',
40+
files: ['src/**/*.ts']
41+
},
42+
exclude: []
43+
};
44+
45+
module.exports = config;

config/_karma.ng1.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
2+
// Karma configuration file
3+
var clone = require("clone");
4+
var baseconfig = require("./_karma.base");
5+
var files = require('../files').files;
6+
7+
module.exports = function (ngVersion, testFileSuffix) {
8+
var config = clone(baseconfig);
9+
10+
/* Files available to be served by karma, i.e., anything that will be require()'d */
11+
config.files = files.karmaServedFiles(ngVersion);
12+
13+
// karma-systemjs kludge: This is turned into a regexp and is the actual specs that are loaded
14+
config.systemjs.testFileSuffix = testFileSuffix;
15+
16+
return config;
17+
};
18+

config/karma.core.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Karma configuration file
2+
var clone = require("clone");
3+
var baseconfig = require("./_karma.base");
4+
var files = require('../files').files;
5+
6+
module.exports = function (karma) {
7+
var config = clone(baseconfig);
8+
9+
/* Files available to be served, so anything that will be require()'d */
10+
config.files = files.karmaServedFiles();
11+
12+
// karma-systemjs kludge: This is turned into a regexp and is the actual specs that are loaded
13+
config.systemjs.testFileSuffix = "/test/core/\\S+.[tj]s";
14+
15+
karma.set(config);
16+
};

config/karma.js

Lines changed: 0 additions & 54 deletions
This file was deleted.

config/karma.ng12.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
var ng1ConfigFactory = require("./_karma.ng1");
2+
module.exports = function (karma) {
3+
karma.set(ng1ConfigFactory("1.2.28", "/test/ng1/\\S+.[tj]s"));
4+
};

config/karma.ng13.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
var ng1ConfigFactory = require("./_karma.ng1");
2+
module.exports = function (karma) {
3+
karma.set(ng1ConfigFactory("1.3.16", "/test/ng1/\\S+.[tj]s"));
4+
};

config/karma.ng14.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
var ng1ConfigFactory = require("./_karma.ng1");
2+
module.exports = function (karma) {
3+
karma.set(ng1ConfigFactory("1.4.9", "/test/ng1/\\S+.[tj]s"));
4+
};

config/karma.ng15.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
var ng1ConfigFactory = require("./_karma.ng1");
2+
module.exports = function (karma) {
3+
karma.set(ng1ConfigFactory("1.5.0", "/test/ng1/\\S+.[tj]s"));
4+
};

config/system.config.js

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ System.config({
77
'system-polyfills': 'node_modules/systemjs/dist/system-polyfills.js',
88
'es6-module-loader': 'node_modules/es6-module-loader/dist/es6-module-loader.js',
99
'phantomjs-polyfill': 'node_modules/phantomjs-polyfill/bind-polyfill.js',
10-
'angular-ui-router': 'src/ng1.ts'
10+
'rxjs': 'node_modules/rxjs/bundles/Rx.js',
11+
'@angular': 'node_modules/@angular',
12+
13+
'angular-ui-router': 'src/ng1.ts',
14+
'ui-router-core': 'src/core.ts',
15+
'ui-router-ng2': 'src/ng2.ts'
1116
},
1217
packages: {
13-
'build/es6': {
14-
defaultExtension: 'js'
15-
},
16-
'src': {
17-
defaultExtension: 'ts'
18-
}
18+
'build/es6': { defaultExtension: 'js' },
19+
'src': { defaultExtension: 'ts' },
20+
21+
'@angular/core': { main: 'index.js', defaultExtension: 'js' },
22+
'@angular/compiler': { main: 'index.js', defaultExtension: 'js' },
23+
'@angular/common': { main: 'index.js', defaultExtension: 'js' },
24+
'@angular/http': { main: 'index.js', defaultExtension: 'js' },
25+
'@angular/testing': { main: 'index.js', defaultExtension: 'js' },
26+
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
27+
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' }
1928
}
2029
});

0 commit comments

Comments
 (0)