tweaking test environments to match what sauce labs offers, updating …

…tests to fail faster on errors
nfriedly · Dec 17, 2013 · 13f40a7 · 13f40a7
1 parent 84be5eb
commit 13f40a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-sauce_connect.log
+sauce_connect.log
+sauce_connect.log.*
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -55,14 +55,14 @@ module.exports = function(grunt) {
                         tags: ['firefox', 'win']
                     }, {
                         browserName: 'firefox',
-                        platform: 'OS X 10.8',
+                        platform: 'OS X 10.6', // todo: update to 10.9 once saucelabs supports it
                         tags: ['firefox', 'mac']
                     }, {
                         browserName: 'chrome',
                         tags: ['chrome', 'win']
                     }, {
                         browserName: 'chrome',
-                        platform: 'OS X 10.8',
+                        platform: 'OS X 10.9',
                         tags: ['chrome', 'mac']
                     }, {
                         browserName: 'safari',
@@ -72,7 +72,7 @@ module.exports = function(grunt) {
                     }, {
                         browserName: 'safari',
                         version: 6,
-                        platform: 'OS X 10.8',
+                        platform: 'OS X 10.8', // todo: update to 10.9 once saucelabs supports it
                         tags: ['safari', 'mac']
                     }, {
                         browserName: 'opera',

diff --git a/tests/spec/flashcookies-spec.js b/tests/spec/flashcookies-spec.js
@@ -30,7 +30,7 @@ describe("SwfStore", function() {
      * @param {boolean} [config.debug=false] Is d
      */
     it("should fire the callback after the SWF loads", function() {
-        var onerror = jasmine.createSpy("onerror");
+        var onerror = jasmine.createSpy("onerror").andThrow('onerror callback fired');
         var loaded = false;
         var config = {
             swf_url: SWF_PATH,
@@ -78,7 +78,7 @@ describe("SwfStore", function() {
     });
 
     it("should store and retrieve values", function() {
-        var onerror = jasmine.createSpy("onerror");
+        var onerror = jasmine.createSpy("onerror").andThrow('onerror callback fired');
         var loaded = false;
         var config = {
             swf_url: SWF_PATH,
@@ -106,7 +106,7 @@ describe("SwfStore", function() {
 
 
     it("should allow you to clear previously set values", function() {
-        var onerror = jasmine.createSpy("onerror");
+        var onerror = jasmine.createSpy("onerror").andThrow('onerror callback fired');
         var loaded = false;
         var config = {
             swf_url: SWF_PATH,