Commit f4a3587a authored by Dave Methvin's avatar Dave Methvin

Tests: Straighten out sinon dependencies

* Cherry-pick took the wrong lines for a couple of things.
* Update and commit dependencies after `grunt bower`
parent 09b28534
...@@ -59,7 +59,8 @@ module.exports = function( grunt ) { ...@@ -59,7 +59,8 @@ module.exports = function( grunt ) {
}, },
files: { files: {
"qunit": "qunit/qunit", "qunit": "qunit/qunit",
"require.js": "requirejs/require.js" "require.js": "requirejs/require.js",
"sinon/fake_timers.js": "sinon/lib/sinon/util/fake_timers.js"
} }
} }
}, },
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
<script src="libs/qunit/qunit.js"></script> <script src="libs/qunit/qunit.js"></script>
<script src="libs/require.js"></script> <script src="libs/require.js"></script>
<script src="libs/sinon/fake_timers.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>
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment