Skip to content

Commit

Permalink
Effects: Integrate sinon fake timers into tests. Close gh-1377.
Browse files Browse the repository at this point in the history
  • Loading branch information
johnkpaul authored and dmethvin committed Nov 24, 2013
1 parent dc649a3 commit b407bdd
Show file tree
Hide file tree
Showing 4 changed files with 211 additions and 291 deletions.
6 changes: 5 additions & 1 deletion bower.json
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
}, },
"devDependencies": { "devDependencies": {
"requirejs": "~2.1.8", "requirejs": "~2.1.8",
"qunit": "~1.12.0" "qunit": "~1.12.0",
"sinon": "~1.7.3"
}, },
"exportsOverride": { "exportsOverride": {
"sizzle": { "sizzle": {
Expand All @@ -29,6 +30,9 @@
}, },
"qunit": { "qunit": {
"qunit": "qunit" "qunit": "qunit"
},
"sinon": {
"sinon": "**/*.js"
} }
}, },
"keywords": [ "keywords": [
Expand Down
1 change: 1 addition & 0 deletions test/.jshintrc
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"q": false, "q": false,


"jQuery": true, "jQuery": true,
"sinon": true,
"module": true, "module": true,
"test": true, "test": true,
"amdDefined": true, "amdDefined": true,
Expand Down
1 change: 1 addition & 0 deletions test/index.html
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@


<script src="../bower_modules/qunit/qunit.js"></script> <script src="../bower_modules/qunit/qunit.js"></script>
<script src="../bower_modules/requirejs/require.js"></script> <script src="../bower_modules/requirejs/require.js"></script>
<script src="../bower_modules/sinon/fake_timers.js"></script>
<!-- See testinit for the list of tests --> <!-- See testinit for the list of tests -->
<script src="data/testinit.js"></script> <script src="data/testinit.js"></script>


Expand Down
Loading

0 comments on commit b407bdd

Please sign in to comment.