Skip to content

Commit 44f3733

Browse files
committed
stashing changes
1 parent e55b860 commit 44f3733

File tree

5 files changed

+19
-112
lines changed

5 files changed

+19
-112
lines changed

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
[![Coverage Status](https://coveralls.io/repos/optimizely/nuclear-js/badge.svg?branch=master)](https://coveralls.io/r/optimizely/nuclear-js?branch=master)
55
[![Join the chat at https://gitter.im/optimizely/nuclear-js](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/optimizely/nuclear-js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
66

7-
[![Sauce Test Status](https://saucelabs.com/browser-matrix/nuclearjs.svg)](https://saucelabs.com/u/nuclearjs)
8-
97
Traditional Flux architecture built with ImmutableJS data structures.
108

119
## Documentation

grunt/aliases.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
module.exports = {
22
'test': [
33
'karma:chrome',
4+
'karma:firefox'
45
],
56

6-
'sauce': [
7-
'karma:sauce_modern',
8-
'karma:sauce_ie',
9-
'karma:sauce_mobile',
10-
],
117

128
'ci': [
139
'eslint',
1410
'clean:coverage',
1511
'karma:coverage',
1612
// 'coveralls', //doesn't seem to be a thing anymore.
17-
//'sauce', TODO: investigate why sauce connect isnt working
1813
],
1914
}

grunt/karma.js

+17-18
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
var sauce = require('./sauce')
2-
var path = require('path')
1+
var path = require('path');
32

43
module.exports = {
54
options: {
65
// base path that will be used to resolve all patterns (eg. files, exclude)
76
basePath: path.join(__dirname, '../'),
87
// frameworks to use
9-
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
108
frameworks: ['jasmine'],
119

1210
// list of files / patterns to load in the browser
@@ -46,7 +44,7 @@ module.exports = {
4644
chrome: {
4745
frameworks: ['jasmine'],
4846
reporters: ['progress', 'html'],
49-
browsers: ['ChromeHeadless'], // Use ChromeHeadless instead of Chrome or PhantomJS
47+
browsers: ['ChromeHeadless'], // Use ChromeHeadless for CI
5048
customLaunchers: {
5149
HeadlessChrome: {
5250
base: 'ChromeHeadless',
@@ -57,10 +55,23 @@ module.exports = {
5755
singleRun: true,
5856
},
5957

58+
firefox: {
59+
frameworks: ['jasmine'],
60+
reporters: ['progress', 'html'],
61+
browsers: ['FirefoxHeadless'], // Use FirefoxHeadless for CI
62+
customLaunchers: {
63+
HeadlessFirefox: {
64+
base: 'FirefoxHeadless',
65+
},
66+
},
67+
autoWatch: false,
68+
singleRun: true,
69+
},
70+
6071
coverage: {
6172
frameworks: ['jasmine'],
6273
reporters: ['progress', 'coverage'],
63-
browsers: ['ChromeHeadless'],
74+
browsers: ['ChromeHeadless', 'FirefoxHeadless'], // Run tests on both browsers for coverage
6475
coverageReporter: {
6576
reporters: [
6677
{ type: 'html', dir: 'coverage/' },
@@ -84,16 +95,4 @@ module.exports = {
8495
},
8596
},
8697
},
87-
88-
sauce_modern: {
89-
options: sauce.modern,
90-
},
91-
92-
sauce_ie: {
93-
options: sauce.ie,
94-
},
95-
96-
sauce_mobile: {
97-
options: sauce.mobile,
98-
},
99-
}
98+
};

grunt/sauce.js

-85
This file was deleted.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
"karma-chrome-launcher": "^0.2.3",
4949
"karma-coverage": "^0.4.2",
5050
"karma-es5-shim": "https://github.com/pokehanai/karma-es5-shim/archive/v2.1.0.tar.gz",
51+
"karma-firefox-launcher": "^2.1.3",
5152
"karma-jasmine": "^0.3.6",
5253
"karma-jasmine-html-reporter": "^0.1.8",
53-
"karma-sauce-launcher": "^0.2.14",
5454
"karma-webpack": "^1.7.0",
5555
"load-grunt-config": "^0.17.1",
5656
"lodash": "^4.17.11",

0 commit comments

Comments
 (0)