Rework tests to use es6/JSX and power-assert

.babelrc

@@ -1,3 +1,11 @@
 {
-  "stage": 0
+  "stage": 0,
+  "env": {
+    "test": {
+      "plugins": [
+        // Makes power-assert work
+        "espower"
+      ]
+    }
+  }
 }

.eslintrc

@@ -1,5 +1,6 @@
 {
   root: true,
+  parser: "babel-eslint",
   extends: "eslint:recommended",
   rules: {
     strict: 0,
@@ -16,9 +17,7 @@
   env: {
     browser: true,
     node: true,
-    mocha: true
-  },
-  ecmaFeatures: {
-    jsx: true
+    mocha: true,
+    es6: true
   }
 }

.jsfmtrc

@@ -0,0 +1,17 @@
+{
+  "extensions": [
+    "js",
+    "jsx"
+  ],
+  "plugins": [
+    "esformatter-jsx"
+  ],
+  "jsx": {
+    "formatJSX": true,
+    "attrsOnSameLineAsTag": false,
+    "spaceInJSXExpressionContainers": "",
+    "maxAttrsOnTag": 2,
+    "firstAttributeOnSameLine": true,
+    "alignWithFirstAttribute": false
+  }
+}

Makefile

@@ -13,17 +13,17 @@ test: test-unit test-server
 	@echo "The browser test suite should be run before commit. Run 'make test-local' to run it."
 
 test-unit:
-	@./node_modules/.bin/mocha -R spec -b tests/unit/*.js
+	@env NODE_ENV=test ./node_modules/.bin/mocha -R spec --compilers js:babel/register -b tests/unit/*.js
 
 test-server:
-	@./node_modules/.bin/mocha -R spec -b tests/server/*.js
+	@env NODE_ENV=test ./node_modules/.bin/mocha -R spec --compilers js:babel/register -b tests/server/*.js
 
 test-local:
-	@./node_modules/.bin/babel tests/browser/browser-jsx.jsx > tests/browser/browser-jsx.js
-	@./node_modules/.bin/zuul --local 3000  -- tests/browser/*.js
+	@env NODE_ENV=test ./node_modules/.bin/babel tests/browser/browser-jsx.jsx > tests/browser/browser-jsx.js
+	@env NODE_ENV=test ./node_modules/.bin/zuul --local 3000  -- tests/browser/*.js
 
 test-cloud:
-	@./node_modules/.bin/zuul -- tests/browser/*.js
+	@env NODE_ENV=test ./node_modules/.bin/zuul -- tests/browser/*.js
 
 release-patch: test lint
 	@$(call release,patch)

package.json

@@ -11,13 +11,16 @@
   },
   "devDependencies": {
     "babel": "^5.8.23",
+    "babel-eslint": "^5.0.0-beta6",
+    "babel-plugin-espower": "^1.1.0",
     "browserify": "^11.2.0",
     "browserify-shim": "^3.8.10",
     "envify": "^3.4.0",
     "eslint": "^1.6.0",
     "eslint-plugin-react": "^3.5.1",
     "jsxhint": "^0.15.1",
     "mocha": "^2.3.3",
+    "power-assert": "^1.2.0",
     "semver": "^5.1.0",
     "zuul": "^3.6.0"
   },
@@ -61,4 +64,4 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   }
-}
+}

tests/browser/PathnameEnvironment.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var assert = require('assert');
+var assert = require('power-assert');
 var PathnameEnvironment = require('../../lib/environment/PathnameEnvironment');
 
 describe('PathnameEnvironment', function() {

tests/browser/QueryStringKeyEnvironment.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var assert = require('assert');
+var assert = require('power-assert');
 var QuerystringKeyEnvironment = require('../../lib/environment/QuerystringKeyEnvironment');
 
 describe('QuerystringKeyEnvironment', function() {

tests/browser/browser-jsx.js

@@ -1,5 +1,5 @@
 'use strict';
-var assert = require('assert');
+var assert = require('power-assert');
 var React = require('react');
 var ReactDOM = React; // For 0.13
 var Router = require('../../index');
@@ -25,7 +25,15 @@ function getRenderedContent() {
 }
 
 function assertRendered(text) {
-  assert.equal(getRenderedContent(), text);
+  assert.equal(assert._expr(assert._capt(getRenderedContent(), 'arguments/0'), {
+    content: 'assert.equal(getRenderedContent(), text)',
+    filepath: 'tests/browser/browser-jsx.jsx',
+    line: 31
+  }), assert._expr(assert._capt(text, 'arguments/1'), {
+    content: 'assert.equal(getRenderedContent(), text)',
+    filepath: 'tests/browser/browser-jsx.jsx',
+    line: 31
+  }));
 }
 
 function cleanUp(done) {

tests/browser/browser-jsx.jsx

@@ -1,5 +1,5 @@
 'use strict';
-var assert          = require('assert');
+var assert          = require('power-assert');
 var React           = require('react');
 var ReactDOM        = React; // For 0.13
 var Router          = require('../../index');

tests/browser/browser.js

@@ -1,5 +1,5 @@
 'use strict';
-var assert          = require('assert');
+var assert          = require('power-assert');
 var React           = require('react');
 var ReactDOM        = require('react-dom');
 var ReactTestUtils  = require('react/lib/ReactTestUtils');