Skip to content

Commit

Permalink
configured gruntfile
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan Boyd committed May 12, 2015
1 parent 0104a6e commit 453a24f
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 76 deletions.
8 changes: 4 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var _ = require('lodash');

var desireds = require('./desireds');
var desireds = require('./test/browser/browserTestConfig');

var gruntConfig = {
env: {
Expand All @@ -19,7 +19,7 @@ var gruntConfig = {
},
mocha_istanbul: {
coverage: {
'src': 'test/test.js'
src: ['test/*.js']
}
},
mochaTest: {
Expand All @@ -29,14 +29,14 @@ var gruntConfig = {
quiet: false,
clearRequireCache: true
},
src: ['test/test.js']
src: ['test/*.js']
},
sauce: {
options: {
timeout: 60000,
reporter: 'spec'
},
src: ['test/browserTest.js']
src: ['test/browser/*.js']
}
},
watch: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "generates html reports ",
"main": "app.js",
"scripts": {
"test": "grunt mochaTest:test",
"test": ["grunt mochaTest:test", "grunt test:sauce:parallel"],
"coverage": "`npm bin`/istanbul cover ./test/test.js",
"coveralls": "npm run-script coverage && node bin/coveralls.js < coverage/lcov.info"
},
Expand Down
17 changes: 17 additions & 0 deletions test/browser/browserTestConfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module.exports = {
"chrome": {
"browserName": "chrome",
"visibility": "public",
"build":1
},
"firefox": {
"browserName": "firefox",
"visibility": "public",
"build":1
},
"explorer": {
"browserName": "internet explorer",
"visibility": "public",
"build":1
}
};
72 changes: 72 additions & 0 deletions test/browser/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
'use strict';

/*global describe, after, afterEach, before*/

var chai = require('chai');
chai.expect();
chai.should();

var wd = require('wd');
var chaiAsPromised = require("chai-as-promised");

chai.use(chaiAsPromised);
chaiAsPromised.transferPromiseness = wd.transferPromiseness;

if (!process.env.SAUCE_USERNAME) {
throw new Error("Missing sauce user name");
}

if (!process.env.SAUCE_ACCESS_KEY) {
throw new Error("Missing sauce access key");
}

if (!process.env.DESIRED){
throw new Error("Missing desired env var");
}

var desired = JSON.parse(process.env.DESIRED);

wd.configureHttp({
timeout: 60000,
retryDelay: 15000,
retries: 5
});

describe('browser test ' + desired.browserName, function () {

var browser;
var allPassed = true;

before(function (done) {
var username = process.env.SAUCE_USERNAME;
var accessKey = process.env.SAUCE_ACCESS_KEY;
browser = wd.promiseChainRemote("ondemand.saucelabs.com", 80, username, accessKey);

if (process.env.VERBOSE) {
browser.on('status', function (info) {
console.log(info.cyan);
});

browser.on('command', function (meth, path, data) {
console.log(' > ' + meth.yellow, path.grey, data || '');
});
}
browser
.init(desired)
.nodeify(done);
});

afterEach(function (done) {
allPassed = allPassed && (this.currentTest.state === 'passed');
done();
});

after(function (done) {
browser
.quit()
.sauceJobStatus(allPassed)
.nodeify(done);
});

require('../test');
});
71 changes: 0 additions & 71 deletions test/browserTest.js

This file was deleted.

0 comments on commit 453a24f

Please sign in to comment.