Skip to content

Commit

Permalink
Fix Sauce Labs integration
Browse files Browse the repository at this point in the history
  • Loading branch information
ovidiuch committed Jan 12, 2018
1 parent 663649a commit ff8aece
Show file tree
Hide file tree
Showing 4 changed files with 1,584 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 0.1
- 8
before_script:
- npm install -g grunt-cli
env:
Expand Down
40 changes: 8 additions & 32 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,14 @@
module.exports = function(grunt) {
var browsers = [{
browserName: "chrome",
platform: "OS X 10.8"
}, {
browserName: "chrome",
platform: "XP"
platform: "macOS 10.12"
}, {
browserName: "chrome",
platform: "linux"
}, {
browserName: "firefox",
version: "19",
platform: "XP"
}, {
browserName: "safari",
version: "6",
platform: "OS X 10.8"
}, {
browserName: "opera",
platform: "Windows 2008",
version: "12"
// Tests pass on IE6, but a misc error is thrown. TODO: Sort out with SauceLabs
// }, {
// browserName: "internet explorer",
// platform: "XP",
// version: "6"
}, {
browserName: "internet explorer",
platform: "XP",
version: "7"
}, {
browserName: "internet explorer",
platform: "XP",
version: "8"
version: "7",
platform: "OS X 10.9"
}, {
browserName: "internet explorer",
platform: "VISTA",
Expand All @@ -52,7 +28,7 @@ module.exports = function(grunt) {
helpers: ['spec/matchers.js','spec/helpers.js','spec/setup.js', 'spec/phantomjs-setup.js'],
specs: 'spec/*Spec.js',
styles: 'src/*.css',
host: 'http://localhost:9999',
host: 'http://localhost:9999',
}
}
},
Expand All @@ -70,7 +46,7 @@ module.exports = function(grunt) {
urls: ["http://127.0.0.1:9999/#runner"],
tunnelTimeout: 5,
build: process.env.TRAVIS_JOB_ID,
concurrency: 3,
throttled: 2,
browsers: browsers,
testname: "pasta tests",
tags: ["master"]
Expand All @@ -91,9 +67,9 @@ module.exports = function(grunt) {
grunt.registerTask("test-saucelabs", ["connect", "saucelabs-custom"]);

if (isSauceLabsAvailableInEnvironment()) {
grunt.registerTask("test", ["test-saucelabs"]);
grunt.registerTask("test", ["test-saucelabs"]);
} else {
grunt.registerTask("test", ["test-phantomjs"]);
grunt.registerTask("test", ["test-phantomjs"]);
}
};

Expand All @@ -102,4 +78,4 @@ function isSauceLabsAvailableInEnvironment() {
var sauceKey = process.env.SAUCE_ACCESS_KEY;

return !!sauceUser && !!sauceKey;
}
}
Loading

0 comments on commit ff8aece

Please sign in to comment.