Skip to content

Commit 247dcac

Browse files
committed
Add configuration to run saucelabs from CI
Remove the `Utils.isNumber` function, its not used in the codebase and isn't implemented correctly for IE when testing `new Number(1)`
1 parent 8a28b89 commit 247dcac

File tree

10 files changed

+187
-240
lines changed

10 files changed

+187
-240
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
language: node_js
22
node_js:
3-
- '0.10'
3+
- '0.10'
44
branches:
55
only:
6-
- master
6+
- master
77
before_install:
8-
- npm install -g grunt-cli
8+
- npm install -g grunt-cli
99
env:
1010
global:
11-
secure: E7YHPSZtpjm4I20DB3j3uhkLIeyUGH5Hmos6dynTqoasHo5Z7LIixZaAMRGQitN03rWszrtaV6BRoYmFfjXK39H2LfJxHcCo+3eROZLad8I2tG6ClpsrOy//4xIEg82MGd3wJv81GasIr6kTwm1l4bFZMdj0O5Vb0Y7DGy63f1g=
11+
- secure: E7YHPSZtpjm4I20DB3j3uhkLIeyUGH5Hmos6dynTqoasHo5Z7LIixZaAMRGQitN03rWszrtaV6BRoYmFfjXK39H2LfJxHcCo+3eROZLad8I2tG6ClpsrOy//4xIEg82MGd3wJv81GasIr6kTwm1l4bFZMdj0O5Vb0Y7DGy63f1g=
12+
- secure: i+uPD/Jvg83JWDh+ohdG7oWV7f0JftH3hpVdbg4cqHdKdqjSwH0900F4CuYg6+L8wygZ3nn8hW43kyuX980AF2v1Mij2TL/LcBk434l8qGJUylPChPd0XTIKiXfmTsNphil+weAzLnSYUCGIHlJKP1rAVg6NvoKcRHciufZO+aQ=

grunt/aliases.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
module.exports = {
2-
'ci': [
3-
'clean:coverage',
4-
'karma:coverage',
5-
'coveralls',
2+
'test': [
3+
'karma:phantom'
4+
],
5+
6+
'sauce': [
7+
'karma:sauce_modern',
8+
'karma:sauce_ie',
9+
'karma:sauce_mobile',
610
],
7-
'coverage': [
11+
12+
'ci': [
813
'clean:coverage',
914
'karma:coverage',
1015
'coveralls',
16+
'sauce',
1117
],
1218
};

grunt/karma-configs/chrome.karma.js

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

grunt/karma-configs/coverage.karma.js

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

grunt/karma-configs/phantom.karma.js

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

grunt/karma.js

Lines changed: 83 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,94 @@
1+
var sauce = require('./sauce')
2+
var path = require('path');
3+
14
module.exports = {
2-
// single run
5+
options: {
6+
// base path that will be used to resolve all patterns (eg. files, exclude)
7+
basePath: path.join(__dirname, '../'),
8+
// frameworks to use
9+
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
10+
frameworks: ['jasmine'],
11+
12+
// list of files / patterns to load in the browser
13+
files: [
14+
'tests/*-tests.js',
15+
],
16+
17+
reporters: ['progress'],
18+
19+
preprocessors: {
20+
'tests/*-tests.js': ['webpack'],
21+
},
22+
23+
webpack: {
24+
module: {
25+
loaders: [
26+
{ test: /\.js$/, loader: 'jstransform-loader' },
27+
],
28+
},
29+
},
30+
31+
port: 9876,
32+
33+
logLevel: 'error',
34+
35+
colors: true,
36+
37+
autoWatch: false,
38+
39+
singleRun: true,
40+
},
41+
342
phantom: {
443
configFile: 'grunt/karma-configs/phantom.karma.js',
44+
frameworks: ['jasmine', 'es5-shim'],
45+
browsers: ['PhantomJS'],
546
},
647

748
chrome: {
8-
configFile: 'grunt/karma-configs/chrome.karma.js',
49+
reporters: ['html'],
50+
browsers: ['Chrome'],
51+
autoWatch: true,
52+
singleRun: false,
953
},
1054

1155
coverage: {
12-
configFile: 'grunt/karma-configs/coverage.karma.js',
56+
frameworks: ['jasmine', 'es5-shim'],
57+
reporters: ['progress', 'coverage'],
58+
browsers: ['PhantomJS'],
59+
coverageReporter: {
60+
reporters: [
61+
{ type: "html", dir: "coverage/" },
62+
{ type: "lcov", dir: "coverage/" },
63+
{ type: "text-summary" },
64+
]
65+
},
66+
67+
webpack: {
68+
module: {
69+
loaders: [
70+
{ test: /\.js$/, loader: 'jstransform-loader' },
71+
],
72+
postLoaders: [
73+
{
74+
test: /\.js$/,
75+
exclude: /(node_modules\/|-tests\.js$)/,
76+
loader: 'istanbul-instrumenter'
77+
}
78+
]
79+
},
80+
},
81+
},
82+
83+
sauce_modern: {
84+
options: sauce.modern,
85+
},
86+
87+
sauce_ie: {
88+
options: sauce.ie,
89+
},
90+
91+
sauce_mobile: {
92+
options: sauce.mobile,
1393
},
1494
};

0 commit comments

Comments
 (0)