Merge branch 'master' of github.com:appendto/jquery-mockjax

roblarsen · Nov 17, 2011 · 29e8db7 · 29e8db7
2 parents 51b104e + bdb6107
commit 29e8db7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/test/index.html b/test/index.html
@@ -3,6 +3,7 @@
     <head>
         <link rel="stylesheet" href="../lib/qunit.css" type="text/css" media="screen" />
         <script src="../lib/qunit.js"></script>
+        <script src="../lib/testswarm.js"></script>
         <script src="jquery.js"></script>
         <script src="../jquery.mockjax.js"></script>
         <script src="test.js"></script>

diff --git a/test/test.js b/test/test.js
@@ -334,7 +334,7 @@ asyncTest('Response returns json', function() {
 	});
 	$.mockjaxClear();
 });
-asyncTest('Response returns jsonp', 5, function() {
+asyncTest('Response returns jsonp', 3, function() {
 	$.mockjax({
 		url: '/jsonp*',
 		contentType: 'text/json',