[#540] Fixes for failing front-end JS tests

ckan · Apr 23, 2013 · 518bc19 · 518bc19
1 parent f4adfdb
commit 518bc19
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/ckan/public/base/test/index.html b/ckan/public/base/test/index.html
@@ -26,8 +26,7 @@
     <!-- Source -->
     <script src="../vendor/jed.js"></script>
     <script src="../vendor/jquery.js"></script>
-    <script src="../vendor/bootstrap/js/bootstrap-transition.js"></script>
-    <script src="../vendor/bootstrap/js/bootstrap-alert.js"></script>
+    <script src="../vendor/bootstrap/js/bootstrap.js"></script>
     <script src="../javascript/plugins/jquery.inherit.js"></script>
     <script src="../javascript/plugins/jquery.proxy-all.js"></script>
     <script src="../javascript/plugins/jquery.url-helpers.js"></script>

diff --git a/ckan/public/base/test/spec/client.spec.js b/ckan/public/base/test/spec/client.spec.js
@@ -154,7 +154,7 @@ describe('ckan.Client()', function () {
         }
       };
 
-      var target = this.client.parseCompletions(data);
+      var target = this.client.parseCompletions(data, {});
 
       assert.deepEqual(target, ["1 percent", "18thc", "19thcentury"]);
     });
@@ -168,7 +168,7 @@ describe('ckan.Client()', function () {
         }
       };
 
-      var target = this.client.parseCompletions(data);
+      var target = this.client.parseCompletions(data, {});
 
       assert.deepEqual(target, ["json", "csv", "text"]);
     });
@@ -182,7 +182,7 @@ describe('ckan.Client()', function () {
         }
       };
 
-      var target = this.client.parseCompletions(data);
+      var target = this.client.parseCompletions(data, {});
 
       assert.deepEqual(target, ["Test"]);
     });

diff --git a/ckan/public/base/test/spec/modules/autocomplete.spec.js b/ckan/public/base/test/spec/modules/autocomplete.spec.js
@@ -146,13 +146,6 @@ describe('ckan.modules.AutocompleteModule()', function () {
       this.module.getCompletions('term with spaces');
       assert.calledWith(this.target, 'http://example.com?term=term%20with%20spaces');
     });
-
-    it('should set the formatter to work with the plugin', function () {
-      this.module.getCompletions(this.term);
-      assert.calledWith(this.target, 'http://example.com?term=term', {
-        format: this.sandbox.client.parseCompletionsForPlugin
-      });
-    });
   });
 
   describe('.lookup(term, fn)', function () {