Skip to content

Commit

Permalink
Allow running qunit without saucelabs.
Browse files Browse the repository at this point in the history
  • Loading branch information
DickvdBrink committed Dec 27, 2013
1 parent 8a76920 commit 188d4e8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
8 changes: 7 additions & 1 deletion Gruntfile.js
Expand Up @@ -34,7 +34,11 @@ module.exports = function(grunt) {
}
},
qunit: {
all: ['http://localhost:9999/test/index.html']
all: {
options: {
urls: ['http://localhost:9999/test/index.html']
}
}
},

'saucelabs-qunit': {
Expand Down Expand Up @@ -79,6 +83,8 @@ module.exports = function(grunt) {
var testJobs = ["build", "connect"];
if (saucekey !== null) {
testJobs.push("saucelabs-qunit");
} else {
testJobs.push("qunit");
}

grunt.registerTask('test', testJobs);
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -26,6 +26,7 @@
"grunt-contrib-concat": "~0.1.3",
"grunt-contrib-uglify": "~0.1.1",
"grunt-contrib-connect": "~0.1.2",
"grunt-contrib-qunit": "0.3.0",
"grunt-saucelabs": "~4.0.0",
"grunt-contrib-jshint": "~0.1.1",
"grunt-contrib-watch": "~0.3.1",
Expand Down
4 changes: 2 additions & 2 deletions test/index.html
Expand Up @@ -2,7 +2,7 @@
<head>
<title>Testing IndexedDB Shim</title>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<link rel="stylesheet" href="http://code.jquery.com/qunit/git/qunit.css" type="text/css" media="screen" />
<link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.12.0.css" type="text/css" media="screen" />
<style type="text/css">
.runOption, .browser {
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
Expand All @@ -26,7 +26,7 @@
margin: 0 10px;
}
</style>
<script type="text/javascript" src="http://code.jquery.com/qunit/git/qunit.js">
<script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.12.0.js">
</script>
<script type="text/javascript" src = "queuedUnit.js">
</script>
Expand Down

0 comments on commit 188d4e8

Please sign in to comment.