upgrade test jquery dep to 1.11.2, fix incorrect behaviour

SebT · Feb 22, 2015 · df1beb1 · df1beb1
1 parent 2266385
commit df1beb1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/bootbox.js b/bootbox.js
@@ -449,6 +449,10 @@
         var groups = {};
         inputOptions = options.inputOptions || [];
 
+        if (!$.isArray(inputOptions)) {
+          throw new Error("Please pass an array of input options");
+        }
+
         if (!inputOptions.length) {
           throw new Error("prompt with select requires options");
         }

diff --git a/karma.conf.js b/karma.conf.js
@@ -2,7 +2,7 @@ var baseConfig = require("./karma-base.conf");
 
 module.exports = baseConfig({
   vendor: [
-    "tests/vendor/jquery-1.8.3.min.js",
+    "tests/vendor/jquery-1.11.2.min.js",
     "tests/vendor/bootstrap-3.0.0.min.js"
   ]
 });
diff --git a/tests/prompt.test.coffee b/tests/prompt.test.coffee
@@ -344,7 +344,7 @@ describe "bootbox.prompt", ->
           @options.inputOptions = 'foo'
 
         it "throws an error", ->
-          expect(@create).to.throw /given options in wrong format/
+          expect(@create).to.throw "Please pass an array of input options"
 
       describe "with empty options", ->
         beforeEach ->

diff --git a/tests/vendor/bootstrap-3.3.2.min.js b/tests/vendor/bootstrap-3.3.2.min.js
diff --git a/tests/vendor/jquery-1.11.2.min.js b/tests/vendor/jquery-1.11.2.min.js