Skip to content

Commit b2adcab

Browse files
author
Eric Wendelin
committed
Add es6-promise and fixtures to Karma config.
1 parent 5c98f0a commit b2adcab

File tree

2 files changed

+62
-4
lines changed

2 files changed

+62
-4
lines changed

karma.conf.ci.js

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,26 @@ module.exports = function (config) {
55
process.exit(1);
66
}
77

8+
// Commented some of these out just so CI doesn't take forever.
89
// Check out https://saucelabs.com/platforms for all browser/platform combos
910
var customLaunchers = {
10-
// FIXME: for iOS8 - TypeError: Can only call XMLHttpRequest.send on instances of XMLHttpRequest
11-
//slIOS8: {
11+
//slIOS7: {
1212
// base: 'SauceLabs',
1313
// browserName: 'iPhone',
1414
// platform: 'OS X 10.9',
15-
// version: '8.1'
15+
// version: '7.1'
16+
//},
17+
slIOS8: {
18+
base: 'SauceLabs',
19+
browserName: 'iPhone',
20+
platform: 'OS X 10.9',
21+
version: '8.1'
22+
},
23+
//slAndroid4: {
24+
// base: 'SauceLabs',
25+
// browserName: 'Android',
26+
// platform: 'Linux',
27+
// version: '4.0'
1628
//},
1729
slChrome: {
1830
base: 'SauceLabs',
@@ -22,6 +34,24 @@ module.exports = function (config) {
2234
base: 'SauceLabs',
2335
browserName: 'firefox'
2436
},
37+
//slSafari6: {
38+
// base: 'SauceLabs',
39+
// browserName: 'safari',
40+
// platform: 'OS X 10.8',
41+
// version: '6'
42+
//},
43+
//slSafari7: {
44+
// base: 'SauceLabs',
45+
// browserName: 'safari',
46+
// platform: 'OS X 10.9',
47+
// version: '7'
48+
//},
49+
//slSafari8: {
50+
// base: 'SauceLabs',
51+
// browserName: 'safari',
52+
// platform: 'OS X 10.10',
53+
// version: '8'
54+
//}
2555
slOpera: {
2656
base: 'SauceLabs',
2757
browserName: 'opera'
@@ -32,12 +62,36 @@ module.exports = function (config) {
3262
platform: 'Windows 8.1',
3363
version: '11'
3464
}
65+
//slIE10: {
66+
// base: 'SauceLabs',
67+
// browserName: 'internet explorer',
68+
// platform: 'Windows 8',
69+
// version: '10'
70+
//}
3571
//slIE9: {
3672
// base: 'SauceLabs',
3773
// browserName: 'internet explorer',
3874
// platform: 'Windows 7',
3975
// version: '9'
4076
//}
77+
//slIE8: {
78+
// base: 'SauceLabs',
79+
// browserName: 'internet explorer',
80+
// platform: 'Windows XP',
81+
// version: '8'
82+
//}
83+
//slIE7: {
84+
// base: 'SauceLabs',
85+
// browserName: 'internet explorer',
86+
// platform: 'Windows XP',
87+
// version: '7'
88+
//}
89+
//slIE6: {
90+
// base: 'SauceLabs',
91+
// browserName: 'internet explorer',
92+
// platform: 'Windows XP',
93+
// version: '6'
94+
//}
4195
};
4296

4397
config.set({
@@ -46,8 +100,10 @@ module.exports = function (config) {
46100
files: [
47101
'node_modules/error-stack-parser/dist/error-stack-parser.min.js',
48102
'node_modules/stack-generator/dist/stack-generator.min.js',
103+
'node_modules/es6-promise/dist/es6-promise.min.js',
49104
'node_modules/stacktrace-gps/dist/stacktrace-gps.min.js',
50105
'stacktrace.js',
106+
'spec/fixtures/*.js',
51107
'spec/spec-helper.js',
52108
'spec/*-spec.js'
53109
],

karma.conf.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ module.exports = function (config) {
55
files: [
66
'node_modules/error-stack-parser/dist/error-stack-parser.min.js',
77
'node_modules/stack-generator/dist/stack-generator.min.js',
8+
'node_modules/es6-promise/dist/es6-promise.min.js',
89
'node_modules/stacktrace-gps/dist/stacktrace-gps.min.js',
910
'stacktrace.js',
11+
'spec/fixtures/*.js',
1012
'spec/spec-helper.js',
1113
'spec/*-spec.js'
1214
],
@@ -23,7 +25,7 @@ module.exports = function (config) {
2325
logLevel: config.LOG_INFO,
2426
autoWatch: true,
2527
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
26-
browsers: ['ChromeCanary', 'Firefox', 'Opera', 'Safari'],
28+
browsers: ['ChromeCanary', 'Firefox'],
2729
singleRun: false
2830
});
2931
};

0 commit comments

Comments
 (0)