Fixed some tests in old Webkit browsers

Author: JamesMessinger

tests/fixtures/globals.js

@@ -15,8 +15,7 @@
     window.expect = chai.expect;
     window.userAgent = {
       isNode: false,
-      isBrowser: true,
-      isPhantomJS: /PhantomJS/.test(navigator.userAgent)
+      isBrowser: true
     };
   }
   else {

tests/specs/blank/blank.spec.js

@@ -1,51 +1,66 @@
 'use strict';
 
-// Browserify's HTTP module throws errors in PhantomJS when downloading zero-byte files
-if (!userAgent.isPhantomJS) {
-  describe('Blank files', function() {
-    it('should throw an error if parsed as YAML', function(done) {
-      $RefParser
-        .parse(path.rel('specs/blank/blank.yaml'))
-        .then(helper.shouldNotGetCalled(done))
-        .catch(function(err) {
-          expect(err).to.be.an.instanceOf(SyntaxError);
-          expect(err.message).to.contain('blank/blank.yaml" is not a valid JSON Schema');
-          done();
-        })
-        .catch(helper.shouldNotGetCalled(done));
-    });
+describe('Blank files', function() {
+  var windowOnError, testDone;
+
+  beforeEach(function() {
+    // Some old Webkit browsers throw an error when downloading zero-byte files.
+    windowOnError = global.onerror;
+    global.onerror = function() {
+      testDone();
+      return true;
+    }
+  });
+
+  afterEach(function() {
+    global.onerror = windowOnError;
+  });
 
-    it('should throw an error if parsed as JSON', function(done) {
-      $RefParser
-        .parse(path.rel('specs/blank/blank.yaml'), {allow: {yaml: false}})
-        .then(helper.shouldNotGetCalled(done))
-        .catch(function(err) {
+  it('should throw an error if parsed as YAML', function(done) {
+    testDone = done;
+    $RefParser
+      .parse(path.rel('specs/blank/blank.yaml'))
+      .then(helper.shouldNotGetCalled(done))
+      .catch(function(err) {
+        expect(err).to.be.an.instanceOf(SyntaxError);
+        expect(err.message).to.contain('blank/blank.yaml" is not a valid JSON Schema');
+        done();
+      })
+      .catch(helper.shouldNotGetCalled(done));
+  });
+
+  it('should throw an error if parsed as JSON', function(done) {
+    testDone = done;
+    $RefParser
+      .parse(path.rel('specs/blank/blank.yaml'), {allow: {yaml: false}})
+      .then(helper.shouldNotGetCalled(done))
+      .catch(function(err) {
+        expect(err).to.be.an.instanceOf(SyntaxError);
+        expect(err.message).to.contain('Error parsing "');
+        expect(err.message).to.contain('blank/blank.yaml"');
+        done();
+      })
+      .catch(helper.shouldNotGetCalled(done));
+  });
+
+  it('should throw an error if "options.allow.empty" is disabled', function(done) {
+    testDone = done;
+    $RefParser
+      .parse(path.rel('specs/blank/blank.yaml'), {allow: {empty: false}})
+      .then(helper.shouldNotGetCalled(done))
+      .catch(function(err) {
+        if (userAgent.isNode) {
           expect(err).to.be.an.instanceOf(SyntaxError);
           expect(err.message).to.contain('Error parsing "');
           expect(err.message).to.contain('blank/blank.yaml"');
-          done();
-        })
-        .catch(helper.shouldNotGetCalled(done));
-    });
-
-    it('should throw an error if "options.allow.empty" is disabled', function(done) {
-      $RefParser
-        .parse(path.rel('specs/blank/blank.yaml'), {allow: {empty: false}})
-        .then(helper.shouldNotGetCalled(done))
-        .catch(function(err) {
-          if (userAgent.isNode) {
-            expect(err).to.be.an.instanceOf(SyntaxError);
-            expect(err.message).to.contain('Error parsing "');
-            expect(err.message).to.contain('blank/blank.yaml"');
-            expect(err.message).to.contain('Parsed value is empty');
-          }
-          else {
-            expect(err).to.be.an.instanceOf(Error);
-            expect(err.message).to.contain('HTTP 204: No Content');
-          }
-          done();
-        })
-        .catch(helper.shouldNotGetCalled(done));
-    });
+          expect(err.message).to.contain('Parsed value is empty');
+        }
+        else {
+          expect(err).to.be.an.instanceOf(Error);
+          expect(err.message).to.contain('HTTP 204: No Content');
+        }
+        done();
+      })
+      .catch(helper.shouldNotGetCalled(done));
   });
-}
+});