Skip to content

Commit

Permalink
Add sauce labs
Browse files Browse the repository at this point in the history
  • Loading branch information
David Sturley committed Jun 18, 2015
1 parent 5c5e76b commit 0019ba5
Show file tree
Hide file tree
Showing 12 changed files with 143 additions and 39 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
View file
Expand Up @@ -13,3 +13,7 @@ trim_trailing_whitespace = true
[*.json]
indent_style = space
indent_size = 2

[*.yml]
indent_style = space
indent_size = 2
12 changes: 9 additions & 3 deletions .travis.yml
View file
@@ -1,13 +1,19 @@
language: node_js
node_js:
- "0.10"
- '0.10'
before_install:
- npm install -g grunt-cli
- npm install -g bower
- npm install
- bower install
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
branches:
except:
- release
script:
- grunt test-ci
env:
global:
- secure: qjMwfcWDzEhGWxVhmGi5s0MlsU4N/SI96mx6Gj36/GySxgIUU9EFXeN4SZS2OvRmy2/+l0XSt5ln9PWp4Suh2LM8/GaR5I6FALs/9rOLU9py0/G9V1ImqNN9Z6Nk6PvS71SAwP7xOtR+xsywnUEdHZ7dCA3fYEIsOkyq4KRQ9M7JHWogP+h+WsHPcznjPeNxVBCfYCXW0KhrLDzL4ZA+b2UY/IMZDXITdZ99TZQA6XSKTfJg3xs/jqXEo91igHNKN6VxappBqPbDiFxf7az1RExq3oHAawCDTaKE7xxip+6UIxAeo63tiM0vgp92HVrVsIQETSQFBP4aqhl/pfxQ7d9lto7Mz5AlxKvJ3CIwDD/hspPzG5SNrj/FgQLgK7LrUOomMOjf8giRUg8XXLe7Rb1jmbePP3Z9DIEg4Z+ar3dpC2dNiWYFwBM14wY39GuU6tJpzImGRRUGCMPiO55TVTdRZacVeIq1XWRecIH0CabZThJCwOxyiGIT5ETiT5CVs0CgnbVe99l1qyi8wrMnbw4m4UAlMQ/5kytqtsL957RwxvcctCtX+LlshAgC3m1Aq/aF8V/wIYDcRlwOY2HbGiFQJewV7Aeln3t/S8VFjP9hHn8ZTsH9ez3VB57Q53YgrxFCr6CXEK4X3dkmRpx9in3oDI51TxW32tInwGTukSg=
- secure: iaTZRzv9ptLHYsDxyM9JaBO+hfQuD36V9THl4z/0xwVUXcegVL7SiPPW/P1nQiV3w8MfWGbJAlsw08kk/uz+0afosx5GzOp+XonUCeiC5xmTH1zJzrGJh0GI+/45bQp24xdNO3YmPcrX5+CPf8MF7L9as4uzWqHTzpwOCFXZUsIZ5fNaLLmD/xH4WyoP8YViYDs5YFGH8+G/gW6uA4sL7U57GpGsYcfHafUeBmAkwiKy5nz9GcdSdPK1aas29EyfVvq8L0SyQpDJodO6Z4AGzWG5BUgZzzfm/KbCtMIMuCF6XC/dU7nFR8jbd8lZ7NnUS/qfLjNVma8CUhHwime2PfPCHV39DVvNMWQCHhHY1ls+CZbxT7Gz1vppVkbTlFslHpDQr/nGFMjd6BDgzaQCnGz+QggMAqSMDvxMQktC52VkctL6MBSay+YsFDc7VJUWkaLWoS0ezM1QTcKZPCJJKDI21zx0x1jjmOW/R7YRXHwS7rdFsqRP9gK4MfUNRa6Rsqk2CXOo94+uljHqcdvN6A94HoivCT+Rx2jfcvu1O0J9dp5/THaXxJ0y9uEAIJnYgZUSUk+QHIe8Bs/S95xfNyDcdPjgAMEHiOzqWjBWxFiaQoloWJg9Okyx/3wwhVmB5eS1ww6OVEI8K/by/ulf2xeffmOW8snODofEH1/mfw4=
36 changes: 22 additions & 14 deletions Gruntfile.js
View file
@@ -1,4 +1,6 @@
//jshint maxcomplexity: 12
//jshint maxcomplexity: 12, maxstatements: false

var sauceConfig = require('./build/sauce.conf');
module.exports = function (grunt) {
'use strict';

Expand All @@ -9,8 +11,10 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-continue');
grunt.loadNpmTasks('grunt-mocha');
grunt.loadNpmTasks('grunt-mocha-test');
grunt.loadNpmTasks('grunt-saucelabs');
grunt.loadTasks('build/tasks');

grunt.initConfig({
Expand Down Expand Up @@ -167,37 +171,29 @@ module.exports = function (grunt) {
test: {
options: {
urls: ['http://localhost:<%= connect.test.options.port %>/test/unit/'],
reporter: grunt.option('report') ? 'XUnit' : 'Spec',
run: true,
logErrors: true,
log: true,
mocha: {
grep: grunt.option('grep')
}
},
dest: grunt.option('report') ? 'tmp/xunit.xml' : undefined
}
},
checks: {
options: {
urls: ['http://localhost:<%= connect.test.options.port %>/test/checks/'],
run: true,
reporter: grunt.option('report') ? 'XUnit' : 'Spec',
mocha: {
grep: grunt.option('grep')
}
},
dest: grunt.option('report') ? 'tmp/checks-xunit.xml' : undefined
}
},
commons: {
options: {
urls: ['http://localhost:<%= connect.test.options.port %>/test/commons/'],
run: true,
reporter: grunt.option('report') ? 'XUnit' : 'Spec',
mocha: {
grep: grunt.option('grep')
}
},
dest: grunt.option('report') ? 'tmp/commons-xunit.xml' : undefined
}
}
},
mochaTest: {
Expand All @@ -210,6 +206,11 @@ module.exports = function (grunt) {
src: ['test/integration/testrunner.js']
}
},
'saucelabs-mocha': {
core: sauceConfig('core', 'http://localhost:<%= connect.test.options.port %>/test/unit/'),
commons: sauceConfig('commons', 'http://localhost:<%= connect.test.options.port %>/test/commons/'),
checks: sauceConfig('checks', 'http://localhost:<%= connect.test.options.port %>/test/checks/')
},
testconfig: {
test: {
src: ['test/integration/rules/**/*.json'],
Expand Down Expand Up @@ -241,6 +242,13 @@ module.exports = function (grunt) {
});

grunt.registerTask('default', ['build']);
grunt.registerTask('build', ['clean', 'validate', 'concat:commons', 'configure', 'concat:engine', 'copy', 'uglify']);
grunt.registerTask('test', ['build', 'fixture', 'connect', 'testconfig', 'mocha', 'mochaTest', 'jshint']);

grunt.registerTask('build', ['clean', 'validate', 'concat:commons', 'configure',
'concat:engine', 'copy', 'uglify']);

grunt.registerTask('test', ['build', 'fixture', 'connect', 'testconfig',
'mocha', 'mochaTest', 'jshint']);

grunt.registerTask('test-ci', ['build', 'fixture', 'connect', 'continue:on',
'saucelabs-mocha', 'continue:off', 'jshint', 'continue:fail-on-warning']);
};
4 changes: 3 additions & 1 deletion README.md
View file
@@ -1,7 +1,9 @@
# axe-core
[![Version](https://img.shields.io/npm/v/axe-core.svg)](https://www.npmjs.com/package/axe-core)
![Bower](https://img.shields.io/bower/v/axe-core.svg)
[![Bower](https://img.shields.io/bower/v/axe-core.svg)](http://bower.io/search)
[![License](https://img.shields.io/npm/l/axe-core.svg)](LICENSE)
[![Build Status](https://travis-ci.org/dequelabs/axe-core.svg?branch=master)](https://travis-ci.org/dequelabs/axe-core)
[![Sauce Test Status](https://saucelabs.com/buildstatus/dequelabs-axe)](https://saucelabs.com/u/dequelabs-axe)
[![Dependency Status](https://gemnasium.com/dequelabs/axe-core.svg)](https://gemnasium.com/dequelabs/axe-core)
[![Codacy Badge](https://www.codacy.com/project/badge/c2d7835387dd41b3a77eafd439fba559)](https://www.codacy.com/app/dsturley/axe-core)

Expand Down
59 changes: 59 additions & 0 deletions build/sauce.conf.js
View file
@@ -0,0 +1,59 @@

var browsers = exports.browsers = [{
browserName: 'internet explorer',
platform: 'Windows 7',
version: '9.0'
}, {
browserName: 'internet explorer',
platform: 'Windows 8',
version: '10.0'
}, {
browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11.0'
}, {
browserName: 'chrome',
platform: 'Windows 8.1'
}, {
browserName: 'firefox',
platform: 'Windows 8.1'
}, {
browserName: 'iphone',
platform: 'OS X 10.10',
version: '8.2',
deviceName: 'iPhone Simulator',
deviceOrientation: 'portrait'
}, {
browserName: 'android',
platform: 'Linux',
version: '5.1',
deviceName: 'Android Emulator',
deviceOrientation: 'portrait'
}, {
browserName: 'safari',
platform: 'OS X 10.10'
}];

function pushIfDefined(a, b) {
if (b) {
a.push(b);
}
}

exports = module.exports = function (name, url) {
var tags = [];
pushIfDefined(process.env.TRAVIS_PULL_REQUEST);
pushIfDefined(process.env.TRAVIS_BRANCH);

return {
options: {
urls: [ url ],
build: process.env.TRAVIS_JOB_ID,
concurrency: 3,
browsers: browsers,
testname: name || 'mocha tests',
public: 'public',
tags: tags.length ? tags : ['local']
}
};
};
9 changes: 6 additions & 3 deletions package.json
View file
Expand Up @@ -9,8 +9,8 @@
"url": "http://deque.com/"
},
"repository": {
"type" : "git",
"url" : "https://github.com/dequelabs/axe-core.git"
"type": "git",
"url": "https://github.com/dequelabs/axe-core.git"
},
"keywords": [
"Accessibility",
Expand All @@ -33,17 +33,20 @@
"dot": "~1.0.3",
"grunt": "~0.4.5",
"grunt-blanket-mocha": "~0.5.0",
"grunt-continue": "^0.1.0",
"grunt-contrib-clean": "~0.6.0",
"grunt-contrib-concat": "~0.5.1",
"grunt-contrib-connect": "~0.10.1",
"grunt-contrib-copy": "^0.8.0",
"grunt-contrib-jshint": "~0.11.2",
"grunt-contrib-uglify": "~0.9.1",
"grunt-contrib-watch": "~0.6.1",
"grunt-mocha-test": "~0.12.7",
"grunt-mocha": "~0.4.12",
"grunt-mocha-test": "~0.12.7",
"grunt-saucelabs": "^8.6.1",
"less": "~2.5.1",
"mocha": "~2.2.5",
"phantomjs": "^1.9.17",
"promise": "~7.0.3",
"revalidator": "~0.3.1",
"selenium-webdriver": "~2.46.1"
Expand Down
5 changes: 2 additions & 3 deletions test/commons/table/is-data-table.js
View file
Expand Up @@ -375,16 +375,15 @@ describe('table.isDataTable', function () {

});

it('should be false if has an applet element descendent', function () {
// Causing sauce labs tests to fail & don't really care about applets
it.skip('should be false if has an applet element descendent', function () {
fixture.innerHTML = '<table>' +
(new Array(4).join('<tr><td></td><td></td><td></td></tr>')) +
'<tr><td><applet></applet></td><td></td><td></td></tr>' +
'</table>';


var node = fixture.querySelector('table');
assert.isFalse(commons.table.isDataTable(node));

});

it('should otherwise be true', function () {
Expand Down
12 changes: 9 additions & 3 deletions test/commons/text/accessible-text.js
View file
Expand Up @@ -738,29 +738,35 @@ describe('text.accessibleText', function() {
fixture.innerHTML = '<div id="t1">Hello</div><div id="t2">World</div>';
var target = document.createElement(tag);
target.setAttribute('aria-labelledby', 't1 t2');
target.style.display = 'inline'; // Firefox hides some of these elements because reasons...
fixture.appendChild(target);

assert.equal(commons.text.accessibleText(target), 'Hello World', tag);
var result = commons.text.accessibleText(target);
assert.equal(result, 'Hello World', tag);
});
});

it('should find aria-label', function() {
tags.forEach(function(tag) {
var target = document.createElement(tag);
target.setAttribute('aria-label', 'Hello World');
target.style.display = 'inline'; // Firefox hack, see above
fixture.appendChild(target);

assert.equal(commons.text.accessibleText(target), 'Hello World', tag);
var result = commons.text.accessibleText(target);
assert.equal(result, 'Hello World', tag);
});
});

it('should find a title attribute', function() {
tags.forEach(function(tag) {
var target = document.createElement(tag);
target.setAttribute('title', 'Hello World');
target.style.display = 'inline'; // Firefox hack, see above
fixture.appendChild(target);

assert.equal(commons.text.accessibleText(target), 'Hello World', tag);
var result = commons.text.accessibleText(target);
assert.equal(result, 'Hello World', tag);
});
});

Expand Down
36 changes: 29 additions & 7 deletions test/runner.tmpl
View file
Expand Up @@ -2,19 +2,21 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>Rule Engine Tests</title>
<title>aXe Tests</title>

<link rel="stylesheet" type="text/css" href="../../node_modules/mocha/mocha.css" />
<script src="../../node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/chai/chai.js"></script>
<script>
mocha.setup('bdd');
mocha.setup({
timeout: 10000,
ui: 'bdd'
});
var assert = chai.assert;
var global = {};
</script>
<% files.forEach(function (file) { %>
<script src="../../<%=file%>"
<% if (file.indexOf('bower_components') === -1) { %>data-cover<% } %>></script>
<script src="../../<%=file%>"></script>
<% }); %>

</head>
Expand All @@ -27,9 +29,29 @@
<% }); %>

<script>
if (navigator.userAgent.indexOf('PhantomJS') < 0) {
mocha.run();
}
var runner = mocha.run();
var failedTests = [];
runner.on('end', function() {
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
runner.on('fail', function logFailure(test, err) {
var flattenTitles = function(test) {
var titles = [];
while (test.parent.title) {
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
}
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
});
</script>
</body>

Expand Down
2 changes: 0 additions & 2 deletions test/unit/public/run-rules.js
View file
Expand Up @@ -126,7 +126,6 @@ describe('runRules', function () {
});

it('should work', function (done) {
this.timeout(5000);
axe._load({ rules: [{
id: 'html',
selector: 'html',
Expand All @@ -151,7 +150,6 @@ describe('runRules', function () {
});

it('should properly order iframes', function (done) {
this.timeout(5000);
axe._load({ rules: [{
id: 'iframe',
selector: 'iframe',
Expand Down
2 changes: 0 additions & 2 deletions test/unit/public/run-tool.js
View file
Expand Up @@ -47,7 +47,6 @@ describe('runTool', function () {
});

it('should work without frames', function (done) {
this.timeout(5000);
var target = document.createElement('div');
target.id = 'target';
fixture.appendChild(target);
Expand All @@ -70,7 +69,6 @@ describe('runTool', function () {
});

it('should work across frames', function (done) {
this.timeout(5000);
axe._load({
rules: [],
tools: [{
Expand Down
1 change: 0 additions & 1 deletion test/unit/utils/collect-results-from-frames.js
View file
Expand Up @@ -9,7 +9,6 @@ describe('utils.collectResultsFromFrames', function () {
});

it('should timeout after 30s', function (done) {
this.timeout(5000);
var orig = window.setTimeout;
window.setTimeout = function (fn, to) {
if (to === 30000) {
Expand Down

0 comments on commit 0019ba5

Please sign in to comment.