Merge pull request #59 from github/mocha

josh · josh · commit 99aae5dc85dd · 2015-01-10T19:06:03.000-08:00
Switch to Mocha
diff --git a/bower.json b/bower.json
@@ -3,8 +3,7 @@
   "version": "0.4.0",
   "main": "fetch.js",
   "devDependencies": {
-    "es6-promise": "1.0.0",
-    "qunit": "1.14.0"
+    "es6-promise": "1.0.0"
   },
   "ignore": [
     ".*",
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/package.json b/package.json
@@ -5,7 +5,10 @@
   "private": true,
   "devDependencies": {
     "bower": "1.3.8",
+    "chai": "1.10.0",
     "jshint": "2.5.2",
-    "node-qunit-phantomjs": "0.2.2"
+    "mocha-phantomjs": "3.5.2",
+    "mocha": "2.1.0",
+    "phantomjs": "1.9.13"
   }
 }
diff --git a/test/.jshintrc b/test/.jshintrc
@@ -18,27 +18,14 @@
   "browser": true,
   "worker": true,
   "globals": {
-    "MockXHR": false,
-    "QUnit": false,
     "fetch": false,
     "Headers": false,
     "Request": false,
     "Response": false,
-    "module": false,
+    "mocha": false,
+    "chai": false,
+    "suite": false,
     "test": false,
-    "asyncTest": false,
-    "promiseTest": false,
-    "testDone": false,
-    "expect": false,
-    "start": false,
-    "stop": false,
-    "ok": false,
-    "equal": false,
-    "notEqual": false,
-    "deepEqual": false,
-    "notDeepEqual": false,
-    "strictEqual": false,
-    "notStrictEqual": false,
-    "raises": false
+    "assert": false
   }
 }
diff --git a/test/run.sh b/test/run.sh
@@ -11,4 +11,5 @@ node ./test/server.js $port &>/dev/null &
 server_pid=$!
 trap "kill $server_pid" INT EXIT
 
-node ./node_modules/.bin/node-qunit-phantomjs "http://localhost:$port/test/test.html"
+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
@@ -2,28 +2,29 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Test Suite</title>
-  <link rel="stylesheet" href="../bower_components/qunit/qunit/qunit.css">
+  <title>Fetch Tests</title>
+  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
 </head>
 <body>
-  <div id="qunit"></div>
-  <div id="qunit-fixture"></div>
+  <div id="mocha"></div>
+  <script src="../node_modules/chai/chai.js"></script>
+  <script src="../node_modules/mocha/mocha.js"></script>
+  <script>
+    mocha.setup('tdd')
+    self.assert = chai.assert
+  </script>
+
   <script src="../bower_components/es6-promise/promise.js"></script>
   <script src="../fetch.js"></script>
-  <script src="../bower_components/qunit/qunit/qunit.js"></script>
+
+  <script src="test.js"></script>
+
   <script>
-    QUnit.promiseTest = function(testName, expected, callback) {
-      QUnit.test(testName, expected, function() {
-        stop();
-        Promise.resolve().then(callback).then(start, function(error) {
-          ok(false, error);
-          start();
-        });
-      });
+    if (self.mochaPhantomJS) {
+      mochaPhantomJS.run()
+    } else {
+      mocha.run()
     }
-    window.promiseTest = QUnit.promiseTest;
   </script>
-  <script>QUnit.config.testTimeout = 1000</script>
-  <script src="./test.js"></script>
 </body>
 </html>
diff --git a/test/test.js b/test/test.js
diff --git a/test/worker.js b/test/worker.js

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
`@@ -5,7 +5,10 @@`
`5`	`5`	`"private": true,`
`6`	`6`	`"devDependencies": {`
`7`	`7`	`"bower": "1.3.8",`
	`8`	`+ "chai": "1.10.0",`
`8`	`9`	`"jshint": "2.5.2",`
`9`		`- "node-qunit-phantomjs": "0.2.2"`
	`10`	`+ "mocha-phantomjs": "3.5.2",`
	`11`	`+ "mocha": "2.1.0",`
	`12`	`+ "phantomjs": "1.9.13"`
`10`	`13`	`}`
`11`	`14`	`}`