Test in web worker

josh · josh · commit acac0fbb31e4 · 2015-01-10T19:02:46.000-08:00
Closes #51
diff --git a/fetch.js b/fetch.js
@@ -92,9 +92,11 @@
       }
     }
 
-    this.formData = function() {
-      var rejected = consumed(this)
-      return rejected ? rejected : Promise.resolve(decode(this._body))
+    if (self.FormData) {
+      this.formData = function() {
+        var rejected = consumed(this)
+        return rejected ? rejected : Promise.resolve(decode(this._body))
+      }
     }
 
     this.json = function() {
diff --git a/test/.jshintrc b/test/.jshintrc
@@ -22,6 +22,8 @@
     "Headers": false,
     "Request": false,
     "Response": false,
+    "mocha": false,
+    "chai": false,
     "suite": false,
     "test": false,
     "assert": false
diff --git a/test/run.sh b/test/run.sh
@@ -12,3 +12,4 @@ server_pid=$!
 trap "kill $server_pid" INT EXIT
 
 node ./node_modules/.bin/mocha-phantomjs -s localToRemoteUrlAccessEnabled=true -s webSecurityEnabled=false "http://localhost:$port/test/test.html"
+node ./node_modules/.bin/mocha-phantomjs -s localToRemoteUrlAccessEnabled=true -s webSecurityEnabled=false "http://localhost:$port/test/test-worker.html"
diff --git a/test/test-worker.html b/test/test-worker.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Fetch Worker Tests</title>
+  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+</head>
+<body>
+  <div id="mocha"></div>
+  <script src="../node_modules/mocha/mocha.js"></script>
+
+  <script>
+    mocha.setup('tdd')
+
+    var worker = new Worker('worker.js')
+
+    worker.addEventListener('message', function(e) {
+      switch (e.data.name) {
+        case 'pass':
+          test(e.data.title, function() {})
+          break
+        case 'pending':
+          test(e.data.title)
+          break
+        case 'fail':
+          test(e.data.title, function() {
+            var err = new Error(e.data.message)
+            err.stack = e.data.stack
+            throw err
+          })
+          break
+        case 'end':
+          if (self.mochaPhantomJS) {
+            mochaPhantomJS.run()
+          } else {
+            mocha.run()
+          }
+          break
+      }
+    })
+  </script>
+</body>
+</html>
diff --git a/test/test.html b/test/test.html
@@ -10,8 +10,8 @@
   <script src="../node_modules/chai/chai.js"></script>
   <script src="../node_modules/mocha/mocha.js"></script>
   <script>
-    mocha.setup('tdd');
-    self.assert = chai.assert;
+    mocha.setup('tdd')
+    self.assert = chai.assert
   </script>
 
   <script src="../bower_components/es6-promise/promise.js"></script>
@@ -21,9 +21,9 @@
 
   <script>
     if (self.mochaPhantomJS) {
-      mochaPhantomJS.run();
+      mochaPhantomJS.run()
     } else {
-      mocha.run();
+      mocha.run()
     }
   </script>
 </body>
diff --git a/test/worker.js b/test/worker.js
@@ -0,0 +1,39 @@
+importScripts('../node_modules/chai/chai.js')
+importScripts('../node_modules/mocha/mocha.js')
+
+mocha.setup('tdd')
+self.assert = chai.assert
+
+importScripts('../bower_components/es6-promise/promise.js')
+importScripts('../fetch.js')
+
+importScripts('test.js')
+
+function title(test) {
+  return test.fullTitle().replace(/#/g, '');
+}
+
+function reporter(runner) {
+  runner.on('pending', function(test){
+    self.postMessage({name: 'pending', title: title(test)});
+  });
+
+  runner.on('pass', function(test){
+    self.postMessage({name: 'pass', title: title(test)});
+  });
+
+  runner.on('fail', function(test, err){
+    self.postMessage({
+      name: 'fail',
+      title: title(test),
+      message: err.message,
+      stack: err.stack
+    });
+  });
+
+  runner.on('end', function(){
+    self.postMessage({name: 'end'});
+  });
+}
+
+mocha.reporter(reporter).run()

Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,11 @@`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
`95`		`- this.formData = function() {`
`96`		`- var rejected = consumed(this)`
`97`		`- return rejected ? rejected : Promise.resolve(decode(this._body))`
	`95`	`+ if (self.FormData) {`
	`96`	`+ this.formData = function() {`
	`97`	`+ var rejected = consumed(this)`
	`98`	`+ return rejected ? rejected : Promise.resolve(decode(this._body))`
	`99`	`+ }`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`this.json = function() {`
Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,4 @@ server_pid=$!`
`12`	`12`	`trap "kill $server_pid" INT EXIT`
`13`	`13`
`14`	`14`	`node ./node_modules/.bin/mocha-phantomjs -s localToRemoteUrlAccessEnabled=true -s webSecurityEnabled=false "http://localhost:$port/test/test.html"`
	`15`	`+node ./node_modules/.bin/mocha-phantomjs -s localToRemoteUrlAccessEnabled=true -s webSecurityEnabled=false "http://localhost:$port/test/test-worker.html"`