Refactor tests

Author: STRML

.zuul.yml

@@ -1,14 +1,14 @@
 ui: mocha-bdd
 browsers:
   - name: chrome
-    version: 27..latest
+    version: '27..latest'
   - name: ie
-    version: 9..latest
+    version: '9..latest'
   - name: safari
-    version: 6..latest
+    version: '6..latest'
   - name: firefox
-    version: 24..latest
+    version: '24..latest'
   - name: iphone
-    version: 6..latest
+    version: '6.0..latest'
   - name: ipad
-    version: 6..latest
+    version: '6.0..latest'

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/matchRoutes.js
+	@./node_modules/.bin/mocha -R spec -b tests/unit/*.js
 
 test-server:
-	@./node_modules/.bin/mocha -R spec -b tests/server.js
+	@./node_modules/.bin/mocha -R spec -b tests/server/*.js
 
 test-local:
-	@./node_modules/.bin/babel tests/browser-jsx.jsx > tests/browser-jsx.js
-	@./node_modules/.bin/zuul --local 3000  -- tests/browser.js tests/browser-jsx.js
+	@./node_modules/.bin/babel tests/browser/browser-jsx.jsx > tests/browser/browser-jsx.js
+	@./node_modules/.bin/zuul --local 3000  -- tests/browser/*.js
 
 test-cloud:
-	@./node_modules/.bin/zuul -- tests/browser.js
+	@./node_modules/.bin/zuul -- tests/browser/*.js
 
 release-patch: test lint
 	@$(call release,patch)

tests/QueryStringKeyEnvironment.js renamed to tests/browser/QueryStringKeyEnvironment.js

@@ -1,18 +1,19 @@
 "use strict";
 
-var assert                    = require('assert');
-var QuerystringKeyEnvironment = require('../lib/environment/QuerystringKeyEnvironment');
+var assert = require('assert');
+var QuerystringKeyEnvironment = require('../../lib/environment/QuerystringKeyEnvironment');
 
 describe('QuerystringKeyEnvironment', function() {
 
-  var env;
+  var env, origPath;
 
   beforeEach(function() {
     env = new QuerystringKeyEnvironment('key');
+    origPath = window.location.pathname;
   });
 
   afterEach(function() {
-    window.history.pushState({}, '', '/');
+    window.history.pushState({}, '', origPath);
   });
 
   it('updates the corresponding key in querystring on setPath', function() {

tests/browser-jsx.js renamed to tests/browser/browser-jsx.js

@@ -2,11 +2,7 @@
 var assert = require('assert');
 var React = require('react');
 var ReactDOM = React; // For 0.13
-if (parseInt(React.version.split('.')[1], 10) >= 14) {
-  // For 0.14+
-  ReactDOM = require('react-dom');
-}
-var Router = require('../index');
+var Router = require('../../index');
 
 var historyAPI = window.history !== undefined && window.history.pushState !== undefined;
 

tests/browser/browser-jsx.jsx

@@ -0,0 +1,112 @@
+'use strict';
+var assert          = require('assert');
+var React           = require('react');
+var ReactDOM        = React; // For 0.13
+var Router          = require('../../index');
+
+var historyAPI = (
+    window.history !== undefined &&
+    window.history.pushState !== undefined
+);
+
+var host, app, router;
+
+var timeout = 250;
+
+function delay(ms, func) {
+  if (func === undefined) {
+    func = ms;
+    ms = timeout;
+  }
+  setTimeout(func, ms);
+}
+
+function getRenderedContent() {
+  var content = app.refs.content || app.refs.router;
+  var node = ReactDOM.findDOMNode(content);
+  return node.textContent || node.innerText;
+}
+
+function assertRendered(text) {
+  assert.equal(
+    getRenderedContent(),
+    text
+  );
+}
+
+function cleanUp(done) {
+  ReactDOM.unmountComponentAtNode(host);
+  if (historyAPI) {
+    window.history.pushState({}, '', '/__zuul');
+  }
+  window.location.hash = '';
+  delay(done);
+}
+
+function setUp(App) {
+  return function() {
+    host = document.createElement('div');
+    app = ReactDOM.render(React.createElement(App), host);
+    router = app.refs.router;
+  };
+}
+describe('JSX + Routing with async components', function() {
+
+  if (!historyAPI) return;
+
+  var Main = React.createClass({
+    render: function() {
+      return <div>Main</div>;
+    }
+  });
+
+  var Page1 = React.createClass({
+    render: function() {
+      return <div>Page1</div>;
+    }
+  });
+
+  var Page2 = React.createClass({
+    render: function() {
+      return <div>{this.props.text}</div>;
+    }
+  });
+
+  var App = React.createClass({
+    render: function() {
+      var Locations = Router.Locations;
+      var Location = Router.Location;
+      return (
+        <Locations ref='router' className='App'>
+          <Location path='/__zuul' handler={Main} ref='main'/>
+          <Location path='/__zuul/page1' handler={Page1} ref='page1'/>
+          <Location path='/__zuul/:text' handler={Page2} ref='page2'/>
+        </Locations>
+      );
+    }
+  });
+
+
+  beforeEach(setUp(App));
+  afterEach(cleanUp);
+
+  it('jsx: renders component', function() {
+    assertRendered('Main');
+  });
+
+  it('jsx: renders another route', function(done) {
+    router.navigate('/__zuul/page1', function(err) {
+      if (err) return done(err);
+      assertRendered('Page1');
+      done();
+    });
+  });
+
+  it('jsx: renders a route with params', function(done) {
+    router.navigate('/__zuul/page2', function(err) {
+      if (err) return done(err);
+      assertRendered('page2');
+      done();
+    });
+  });
+});

tests/browser.js renamed to tests/browser/browser.js

@@ -4,8 +4,8 @@ var React           = require('react');
 var ReactDOM        = require('react-dom');
 var ReactTestUtils  = require('react/lib/ReactTestUtils');
 var EventConstants  = require('react/lib/EventConstants');
-var Router          = require('../index');
-var CaptureClicks   = React.createFactory(require('../lib/CaptureClicks'));
+var Router          = require('../../index');
+var CaptureClicks   = React.createFactory(require('../../lib/CaptureClicks'));
 var Location        = React.createFactory(Router.Location);
 var Locations       = React.createFactory(Router.Locations);
 var NotFound        = React.createFactory(Router.NotFound);

tests/server.js renamed to tests/server/server.js

@@ -2,7 +2,7 @@
 var assert    = require('assert');
 var React     = require('react');
 var ReactDOMServer = require('react-dom/server');
-var Router    = require('../index');
+var Router    = require('../../index');
 var Locations = Router.Locations;
 var Pages     = Router.Pages;
 var Location  = Router.Location;

tests/matchRoutes.js renamed to tests/unit/matchRoutes.js

@@ -1,8 +1,8 @@
 'use strict';
 var assert      = require('assert');
-var matchRoutes = require('../lib/matchRoutes');
+var matchRoutes = require('../../lib/matchRoutes');
 var React       = require('react');
-var Router      = require('../');
+var Router      = require('../../');
 var Location    = React.createFactory(Router.Location);
 var NotFound    = React.createFactory(Router.NotFound);