aboutsummaryrefslogtreecommitdiffstats
path: root/Gruntfile.js
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2014-01-10 10:24:52 -0500
committerDave Methvin <dave.methvin@gmail.com>2014-01-10 10:24:57 -0500
commitf4a3587a652d8bb6d6ea6e487ffde6ad9ae1ea6c (patch)
tree6d989d121c39f0a96384366abdebd7009cf69b65 /Gruntfile.js
parent09b28534fa0d9a85d4618ddca163ce187ee50d63 (diff)
downloadjquery-f4a3587a652d8bb6d6ea6e487ffde6ad9ae1ea6c.tar.gz
jquery-f4a3587a652d8bb6d6ea6e487ffde6ad9ae1ea6c.zip
Tests: Straighten out sinon dependencies
* Cherry-pick took the wrong lines for a couple of things. * Update and commit dependencies after `grunt bower`
Diffstat (limited to 'Gruntfile.js')
-rw-r--r--Gruntfile.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 2a32708c9..ada6baa4b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -59,7 +59,8 @@ module.exports = function( grunt ) {
},
files: {
"qunit": "qunit/qunit",
- "require.js": "requirejs/require.js"
+ "require.js": "requirejs/require.js",
+ "sinon/fake_timers.js": "sinon/lib/sinon/util/fake_timers.js"
}
}
},