make createP5Iframe available for all test suites

Author: Zalastax

test/.eslintrc

@@ -7,6 +7,9 @@
     "sinon": false,
     "expect": false,
     "promisedSketch": true,
-    "testSketchWithPromise": true
+    "testSketchWithPromise": true,
+    "createP5Iframe": true,
+    "P5_SCRIPT_URL": true,
+    "P5_SCRIPT_TAG": true
   }
 }

test/js/p5_helpers.js

@@ -10,7 +10,7 @@ function promisedSketch(sketch_fn) {
     myInstance.remove();
   });
   return promise;
-};
+}
 
 function testSketchWithPromise(name, sketch_fn) {
   var test_fn = function() {
@@ -20,4 +20,27 @@ function testSketchWithPromise(name, sketch_fn) {
     return sketch_fn.toString();
   };
   return test(name, test_fn);
-};
+}
+
+var P5_SCRIPT_URL = '../../lib/p5.js';
+var P5_SCRIPT_TAG = '<script src="' + P5_SCRIPT_URL + '"></script>';
+
+function createP5Iframe(html) {
+  html = html || P5_SCRIPT_TAG;
+
+  var elt = document.createElement('iframe');
+
+  document.body.appendChild(elt);
+  elt.setAttribute('style', 'visibility: hidden');
+
+  elt.contentDocument.open();
+  elt.contentDocument.write(html);
+  elt.contentDocument.close();
+
+  return {
+    elt: elt,
+    teardown: function() {
+      elt.parentNode.removeChild(elt);
+    }
+  };
+}

test/unit/core/core.js

@@ -127,51 +127,36 @@ suite('Core', function() {
   });
 
   suite('new p5() / global mode', function() {
-    var P5_SCRIPT_URL = '../../lib/p5.js';
-    var P5_SCRIPT_TAG = '<script src="' + P5_SCRIPT_URL + '"></script>';
     var iframe;
 
-    function createP5Iframe(html) {
-      html = html || P5_SCRIPT_TAG;
-
-      iframe = document.createElement('iframe');
-
-      document.body.appendChild(iframe);
-      iframe.setAttribute('style', 'visibility: hidden');
-
-      iframe.contentDocument.open();
-      iframe.contentDocument.write(html);
-      iframe.contentDocument.close();
-    }
-
     teardown(function() {
       if (iframe) {
-        iframe.parentNode.removeChild(iframe);
+        iframe.teardown();
         iframe = null;
       }
     });
 
     test('is triggered when "setup" is in window', function() {
       return new Promise(function(resolve, reject) {
-        createP5Iframe();
-        iframe.contentWindow.setup = function() {
+        iframe = createP5Iframe();
+        iframe.elt.contentWindow.setup = function() {
           resolve();
         };
       });
     });
 
     test('is triggered when "draw" is in window', function() {
       return new Promise(function(resolve, reject) {
-        createP5Iframe();
-        iframe.contentWindow.draw = function() {
+        iframe = createP5Iframe();
+        iframe.elt.contentWindow.draw = function() {
           resolve();
         };
       });
     });
 
     test('works when p5.js is loaded asynchronously', function() {
       return new Promise(function(resolve, reject) {
-        createP5Iframe(`
+        iframe = createP5Iframe(`
           <script>
             window.onload = function() {
               var script = document.createElement('script');
@@ -181,13 +166,13 @@ suite('Core', function() {
             }
           </script>`);
 
-        iframe.contentWindow.setup = resolve;
+        iframe.elt.contentWindow.setup = resolve;
       });
     });
 
     test('works on-demand', function() {
       return new Promise(function(resolve, reject) {
-        createP5Iframe(
+        iframe = createP5Iframe(
           [
             P5_SCRIPT_TAG,
             '<script>',
@@ -199,9 +184,9 @@ suite('Core', function() {
             '</script>'
           ].join('\n')
         );
-        iframe.contentWindow.onDoneLoading = resolve;
+        iframe.elt.contentWindow.onDoneLoading = resolve;
       }).then(function() {
-        var win = iframe.contentWindow;
+        var win = iframe.elt.contentWindow;
         assert.equal(typeof win.myURL, 'string');
         assert.strictEqual(win.setupCalled, true);
         assert.strictEqual(win.originalP5Instance, win.p5.instance);