chore(test): refactor test conditionals

Author: btford

Diff for: test/patch/HTMLImports.spec.js

@@ -1,10 +1,6 @@
 'use strict';
 
-describe('HTML Imports', function () {
-  if (!supportsImports()) {
-    console.log('WARNING: HTML Imports test (missing this API)');
-    return;
-  }
+describe('HTML Imports', ifEnvSupports(supportsImports, function () {
 
   var flag, hasParent;
 
@@ -79,8 +75,9 @@ describe('HTML Imports', function () {
     return flag;
   }
 
-});
+}));
 
 function supportsImports() {
   return 'import' in document.createElement('link');
 }
+supportsImports.message = 'HTML Imports';

Diff for: test/patch/MutationObserver.spec.js

@@ -1,18 +1,13 @@
 'use strict';
 
-describe('MutationObserver', function () {
+describe('MutationObserver', ifEnvSupports('MutationObserver', function () {
   var elt;
 
   beforeEach(function () {
     elt = document.createElement('div');
   });
 
   it('should work', function () {
-    if (!window.MutationObserver) {
-      console.log('WARNING: skipping MutationObserver test (missing this API)');
-      return;
-    }
-
     var flag = false,
         hasParent;
 
@@ -40,11 +35,6 @@ describe('MutationObserver', function () {
   });
 
   it('should dequeue upon disconnect', function () {
-    if (!window.MutationObserver) {
-      console.log('WARNING: skipping MutationObserver test (missing this API)');
-      return;
-    }
-
     var flag = false,
         childZone = zone.fork({
           dequeueTask: function () {
@@ -63,11 +53,6 @@ describe('MutationObserver', function () {
   });
 
   it('should enqueue once upon observation', function () {
-    if (!window.MutationObserver) {
-      console.log('WARNING: skipping MutationObserver test (missing this API)');
-      return;
-    }
-
     var count = 0,
         childZone = zone.fork({
           enqueueTask: function () {
@@ -88,11 +73,6 @@ describe('MutationObserver', function () {
   });
 
   it('should only dequeue upon disconnect if something is observed', function () {
-    if (!window.MutationObserver) {
-      console.log('WARNING: skipping MutationObserver test (missing this API)');
-      return;
-    }
-
     var flag = false,
         elt = document.createElement('div'),
         childZone = zone.fork({
@@ -108,15 +88,10 @@ describe('MutationObserver', function () {
     });
 
   });
-});
+}));
 
-describe('WebKitMutationObserver', function () {
+describe('WebKitMutationObserver', ifEnvSupports('WebKitMutationObserver', function () {
   it('should ensure observers run within the zone', function () {
-    if (!window.WebKitMutationObserver) {
-      console.log('WARNING: skipping WebKitMutationObserver test (missing this API)');
-      return;
-    }
-
     var flag = false,
         elt = document.createElement('div'),
         hasParent;
@@ -143,4 +118,4 @@ describe('WebKitMutationObserver', function () {
     });
 
   });
-});
+}));

Diff for: test/patch/registerElement.spec.js

@@ -5,12 +5,7 @@
 
 'use strict';
 
-describe('document.registerElement', function () {
-  if (!('registerElement' in document)) {
-    console.log('WARNING: skipping document.registerElement test (missing this API)');
-    return;
-  }
-
+describe('document.registerElement', ifEnvSupports(registerElement, function () {
   var flag, hasParent;
 
   // register a custom element for each callback
@@ -156,4 +151,9 @@ describe('document.registerElement', function () {
     });
   });
 
-});
+}));
+
+function registerElement() {
+  return ('registerElement' in document);
+}
+registerElement.message = 'document.registerElement';

Diff for: test/util.js

@@ -0,0 +1,23 @@
+
+/*
+ * usage:
+
+describe('whatever', run(function () {
+
+}, function () {
+  return 'registerElement'
+}, 'does not support whatevs'))
+
+ */
+function ifEnvSupports(test, block) {
+  return function () {
+    var message = (test.message || test.name || test);
+    if (typeof test === 'string' ? !!window[test] : test()) {
+      block();
+    } else {
+      it('should skip the test if the API does not exist', function () {
+        console.log('WARNING: skipping ' + message + ' tests (missing this API)');
+      });
+    }
+  };
+};