Skip to content
This repository has been archived by the owner on Jan 4, 2020. It is now read-only.

Commit

Permalink
Upgraded 'grunt-saucelabs' build task to 1.3.2. Sauce Labs username a…
Browse files Browse the repository at this point in the history
…nd access key are now both passed by environment variable. Added Sauce Labs build status image to README.
  • Loading branch information
jstayton committed Jan 7, 2013
1 parent 4830783 commit 3368ecb
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -3,4 +3,5 @@ node_js:
- 0.8
env:
global:
- secure: "L+R1lW/wijGbC8fUA8+KqDhBb/6OeFAlWTsXMX/Tk5RvV7yfdm9DCSrhvH72\nShnb9uk9axQlvVaHXTZtACW5ZFNx1MID8UoNe9wASaBq1NHIJJ84mSFo+Ucg\nr9a8t4Be5JgVEeOArNlEp7ZZEif2UcMxIyI8aQugoCyK99ltvVg="
- secure: "XSyE6bdnYKOJsXcfk5ycJ9ciQBTqQG4JWLX1vO3aReDUbxQtQCIy6/3J1CVj\nxrnTWznCIf8rXgVnNkM7cZnzHMdZMRiC1DbzlX8TD8D9ZI4y2mn8AKm8X+YU\n3ffdTRHlCqWB20yWH10cbTpBInRnZTNoA/RVQqTjq4uRPmIR69w="
- secure: "UV5UqiC0/uW5lVR/dZsyErF1fe+SMV5/NsyvlbwYx02db/rVH5qUOtyJez6M\nNushWO6hNMKJDta1+OJIXC3WDRYuY4okOi7FLYe66dztgs9fxHuCSmlWjKy/\n4H6q4fu+LDDF3GSl7Yugl5tGHF+ZqtBPFjZFCFCAtylmqHQYiHQ="
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -16,6 +16,8 @@ Developed by [Justin Stayton](http://twitter.com/jstayton) while at
* [Examples](http://jstayton.github.com/jquery-marcopolo)
* [Release Notes](https://github.com/jstayton/jquery-marcopolo/wiki/Release-Notes)

[![Selenium Test Status](https://saucelabs.com/buildstatus/marcopolo)](https://saucelabs.com/u/marcopolo)

[![Build Status](https://secure.travis-ci.org/jstayton/jquery-marcopolo.png?branch=master)](https://travis-ci.org/jstayton/jquery-marcopolo)

Features
Expand Down
10 changes: 4 additions & 6 deletions grunt.js
Expand Up @@ -2,8 +2,7 @@
module.exports = function (grunt) {
'use strict';

var bannerRegex = /\/\*[\s\S]*?\*\//,
sauceLabsKey = process.env.SAUCE_LABS_KEY;
var bannerRegex = /\/\*[\s\S]*?\*\//;

grunt.initConfig({
pkg: '<json:package.json>',
Expand Down Expand Up @@ -95,8 +94,6 @@ module.exports = function (grunt) {
},
'saucelabs-jasmine': {
all: {
username: 'justinstayton',
key: sauceLabsKey,
testname: 'jquery-marcopolo',
tags: ['master'],
urls: ['<config:jasmine.all>'],
Expand Down Expand Up @@ -162,7 +159,8 @@ module.exports = function (grunt) {
});

return expanded;
})()
})(),
onTestComplete: function () { }
}
},
server: {
Expand All @@ -174,7 +172,7 @@ module.exports = function (grunt) {

var testTasks = ['lint', 'server', 'jasmine'];

if (sauceLabsKey) {
if (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY) {
grunt.loadNpmTasks('grunt-saucelabs');

testTasks.push('saucelabs-jasmine');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -34,7 +34,7 @@
"grunt-bump": "~0.0.1",
"grunt-jasmine-task": "~0.2.3",
"grunt-pkg-to-component": "~1.0.1",
"grunt-saucelabs": "~1.2.1"
"grunt-saucelabs": "~1.3.2"
},
"scripts": {
"test": "grunt test"
Expand Down

0 comments on commit 3368ecb

Please sign in to comment.