teaspoon-jasmine 2.4.1 → 2.9.1

data/lib/teaspoon/jasmine/assets/teaspoon-jasmine1.js

@@ -35,6 +35,24 @@
       return new (Teaspoon.resolveClass("Runner"))();
     };
 
+    Teaspoon.setupErrorHandler = function() {
+      var originalOnError;
+      originalOnError = window.onerror;
+      return window.onerror = function(message) {
+        if (originalOnError && originalOnError.call) {
+          originalOnError.apply(null, arguments);
+        }
+        if (Teaspoon.started) {
+          return;
+        }
+        return Teaspoon.messages.push(JSON.stringify({
+          _teaspoon: true,
+          type: "exception",
+          message: message
+        }));
+      };
+    };
+
     Teaspoon.reload = function() {
       return window.location.reload();
     };
@@ -77,12 +95,12 @@
     };
 
     Teaspoon.log = function() {
-      var e;
+      var e, error;
       Teaspoon.messages.push(arguments[0]);
       try {
         return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log.apply(console, arguments) : void 0 : void 0;
-      } catch (_error) {
-        e = _error;
+      } catch (error) {
+        e = error;
         throw new Error("Unable to use console.log for logging");
       }
     };
@@ -111,7 +129,7 @@
 
     Teaspoon.checkNamespace = function(root, klass) {
       var i, j, len, namespace, namespaces, scope;
-      namespaces = klass.split('.');
+      namespaces = klass.split(".");
       scope = root;
       for (i = j = 0, len = namespaces.length; j < len; i = ++j) {
         namespace = namespaces[i];
@@ -126,6 +144,8 @@
 
   })();
 
+  Teaspoon.setupErrorHandler();
+
 }).call(this);
 (function() {
   Teaspoon.Mixins || (Teaspoon.Mixins = {});
@@ -383,18 +403,18 @@
     };
 
     xhrRequest = function(url, callback) {
-      var e;
+      var e, error, error1;
       if (window.XMLHttpRequest) {
         xhr = new XMLHttpRequest();
       } else if (window.ActiveXObject) {
         try {
           xhr = new ActiveXObject("Msxml2.XMLHTTP");
-        } catch (_error) {
-          e = _error;
+        } catch (error) {
+          e = error;
           try {
             xhr = new ActiveXObject("Microsoft.XMLHTTP");
-          } catch (_error) {
-            e = _error;
+          } catch (error1) {
+            e = error1;
           }
         }
       }
@@ -423,18 +443,18 @@
     }
     xhr = null;
     xhrRequest = function(url, payload, callback) {
-      var e;
+      var e, error, error1;
       if (window.XMLHttpRequest) {
         xhr = new XMLHttpRequest();
       } else if (window.ActiveXObject) {
         try {
           xhr = new ActiveXObject("Msxml2.XMLHTTP");
-        } catch (_error) {
-          e = _error;
+        } catch (error) {
+          e = error;
           try {
             xhr = new ActiveXObject("Microsoft.XMLHTTP");
-          } catch (_error) {
-            e = _error;
+          } catch (error1) {
+            e = error1;
           }
         }
       }
@@ -452,8 +472,8 @@
       if (xhr.readyState !== 4) {
         return;
       }
-      if (xhr.status !== 200) {
-        throw "Unable to call hook \"" + url + "\".";
+      if (xhr.status !== 200 && xhr.status !== 500) {
+        throw JSON.parse(xhr.response).err;
       }
     });
   };
@@ -898,7 +918,7 @@
     };
 
     RadialProgressView.prototype.appendTo = function() {
-      var canvas, e;
+      var canvas, e, error;
       RadialProgressView.__super__.appendTo.apply(this, arguments);
       this.size = 80;
       try {
@@ -907,8 +927,8 @@
         this.ctx = canvas.getContext("2d");
         this.ctx.strokeStyle = "#fff";
         return this.ctx.lineWidth = 1.5;
-      } catch (_error) {
-        e = _error;
+      } catch (error) {
+        e = error;
       }
     };
 

data/lib/teaspoon/jasmine/assets/teaspoon-jasmine2.js

@@ -35,6 +35,24 @@
       return new (Teaspoon.resolveClass("Runner"))();
     };
 
+    Teaspoon.setupErrorHandler = function() {
+      var originalOnError;
+      originalOnError = window.onerror;
+      return window.onerror = function(message) {
+        if (originalOnError && originalOnError.call) {
+          originalOnError.apply(null, arguments);
+        }
+        if (Teaspoon.started) {
+          return;
+        }
+        return Teaspoon.messages.push(JSON.stringify({
+          _teaspoon: true,
+          type: "exception",
+          message: message
+        }));
+      };
+    };
+
     Teaspoon.reload = function() {
       return window.location.reload();
     };
@@ -77,12 +95,12 @@
     };
 
     Teaspoon.log = function() {
-      var e;
+      var e, error;
       Teaspoon.messages.push(arguments[0]);
       try {
         return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log.apply(console, arguments) : void 0 : void 0;
-      } catch (_error) {
-        e = _error;
+      } catch (error) {
+        e = error;
         throw new Error("Unable to use console.log for logging");
       }
     };
@@ -111,7 +129,7 @@
 
     Teaspoon.checkNamespace = function(root, klass) {
       var i, j, len, namespace, namespaces, scope;
-      namespaces = klass.split('.');
+      namespaces = klass.split(".");
       scope = root;
       for (i = j = 0, len = namespaces.length; j < len; i = ++j) {
         namespace = namespaces[i];
@@ -126,6 +144,8 @@
 
   })();
 
+  Teaspoon.setupErrorHandler();
+
 }).call(this);
 (function() {
   Teaspoon.Mixins || (Teaspoon.Mixins = {});
@@ -383,18 +403,18 @@
     };
 
     xhrRequest = function(url, callback) {
-      var e;
+      var e, error, error1;
       if (window.XMLHttpRequest) {
         xhr = new XMLHttpRequest();
       } else if (window.ActiveXObject) {
         try {
           xhr = new ActiveXObject("Msxml2.XMLHTTP");
-        } catch (_error) {
-          e = _error;
+        } catch (error) {
+          e = error;
           try {
             xhr = new ActiveXObject("Microsoft.XMLHTTP");
-          } catch (_error) {
-            e = _error;
+          } catch (error1) {
+            e = error1;
           }
         }
       }
@@ -423,18 +443,18 @@
     }
     xhr = null;
     xhrRequest = function(url, payload, callback) {
-      var e;
+      var e, error, error1;
       if (window.XMLHttpRequest) {
         xhr = new XMLHttpRequest();
       } else if (window.ActiveXObject) {
         try {
           xhr = new ActiveXObject("Msxml2.XMLHTTP");
-        } catch (_error) {
-          e = _error;
+        } catch (error) {
+          e = error;
           try {
             xhr = new ActiveXObject("Microsoft.XMLHTTP");
-          } catch (_error) {
-            e = _error;
+          } catch (error1) {
+            e = error1;
           }
         }
       }
@@ -453,7 +473,7 @@
         return;
       }
       if (xhr.status !== 200) {
-        throw "Unable to call hook \"" + url + "\".";
+        throw JSON.parse(xhr.response).err;
       }
     });
   };
@@ -898,7 +918,7 @@
     };
 
     RadialProgressView.prototype.appendTo = function() {
-      var canvas, e;
+      var canvas, e, error;
       RadialProgressView.__super__.appendTo.apply(this, arguments);
       this.size = 80;
       try {
@@ -907,8 +927,8 @@
         this.ctx = canvas.getContext("2d");
         this.ctx.strokeStyle = "#fff";
         return this.ctx.lineWidth = 1.5;
-      } catch (_error) {
-        e = _error;
+      } catch (error) {
+        e = error;
       }
     };
 

data/lib/teaspoon/jasmine/framework.rb

@@ -11,7 +11,7 @@ module Teaspoon
                                 dependencies: ["teaspoon-jasmine1.js"],
                                 dev_deps: ["teaspoon/jasmine1.js"]
 
-      versions = ["2.0.3", "2.1.3", "2.2.0", "2.2.1", "2.3.4", "2.4.1"]
+      versions = ["2.0.3", "2.1.3", "2.2.0", "2.2.1", "2.3.4", "2.4.1", "2.9.1"]
 
       versions.each do |version|
         register_version version, "jasmine/#{version}.js",

data/lib/teaspoon/jasmine/templates/spec_helper.coffee

@@ -21,7 +21,7 @@
 # setTimeout(Teaspoon.execute, 1000)
 #
 # Matching files
-# By default Teaspoon will look for files that match _spec.{js,js.coffee,.coffee}. Add a filename_spec.js file in your
+# By default Teaspoon will look for files that match _spec.{js,js.coffee,coffee}. Add a filename_spec.js file in your
 # spec path and it'll be included in the default suite automatically. If you want to customize suites, check out the
 # configuration in teaspoon_env.rb
 #
@@ -29,4 +29,4 @@
 # If you'd rather require your spec files manually (to control order for instance) you can disable the suite matcher in
 # the configuration and use this file as a manifest.
 #
-# For more information: http://github.com/modeset/teaspoon
+# For more information: http://github.com/jejacks0n/teaspoon

data/lib/teaspoon/jasmine/templates/spec_helper.js

@@ -21,7 +21,7 @@
 // setTimeout(Teaspoon.execute, 1000)
 //
 // Matching files
-// By default Teaspoon will look for files that match _spec.{js,js.coffee,.coffee}. Add a filename_spec.js file in your
+// By default Teaspoon will look for files that match _spec.{js,js.coffee,coffee}. Add a filename_spec.js file in your
 // spec path and it'll be included in the default suite automatically. If you want to customize suites, check out the
 // configuration in teaspoon_env.rb
 //
@@ -29,4 +29,4 @@
 // If you'd rather require your spec files manually (to control order for instance) you can disable the suite matcher in
 // the configuration and use this file as a manifest.
 //
-// For more information: http://github.com/modeset/teaspoon
+// For more information: http://github.com/jejacks0n/teaspoon

data/lib/teaspoon/jasmine/version.rb

@@ -1,5 +1,5 @@
 module Teaspoon
   module Jasmine
-    VERSION = "2.4.1"
+    VERSION = "2.9.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon-jasmine
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.9.1
 platform: ruby
 authors:
 - jejacks0n
@@ -28,7 +28,7 @@ dependencies:
 description: Run Jasmine specs in the browser or headless with PhantomJS, Selenium
   Webdriver, or Capybara Webkit
 email:
-- info@modeset.com
+- jejacks0n@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -41,6 +41,7 @@ files:
 - lib/teaspoon/jasmine/assets/jasmine/2.2.1.js
 - lib/teaspoon/jasmine/assets/jasmine/2.3.4.js
 - lib/teaspoon/jasmine/assets/jasmine/2.4.1.js
+- lib/teaspoon/jasmine/assets/jasmine/2.9.1.js
 - lib/teaspoon/jasmine/assets/jasmine/MIT.LICENSE
 - lib/teaspoon/jasmine/assets/support/jasmine-jquery-1.7.0.js
 - lib/teaspoon/jasmine/assets/support/jasmine-jquery-2.0.0.js
@@ -67,7 +68,7 @@ files:
 - lib/teaspoon/jasmine/templates/spec_helper.coffee
 - lib/teaspoon/jasmine/templates/spec_helper.js
 - lib/teaspoon/jasmine/version.rb
-homepage: https://github.com/modeset/teaspoon
+homepage: https://github.com/jejacks0n/teaspoon
 licenses:
 - MIT
 metadata: {}