fixed server and client router

Author: HillLiu

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reshow",
-  "version": "0.13.0-beta.20",
+  "version": "0.13.0-beta.21",
   "description": "Flux Reducer Present Library",
   "main": "./build/cjs/src/index.js",
   "module": "./build/es/src/index.js",
@@ -61,7 +61,8 @@
     "build:es:src": "BABEL_ENV=es babel src -d build/es/src --root-mode upward",
     "build:es:ui": "BABEL_ENV=es babel ui -d build/es/ui --root-mode upward",
     "build": "npm run clean && npm run build:cjs && npm run build:es",
-    "mocha": "mocha -r jsdom-global/register 'build/cjs/**/__tests__/*.js'",
+    "mochaFor": "mocha -r jsdom-global/register",
+    "mocha": "npm run mochaFor -- 'build/cjs/**/__tests__/*.js'",
     "test": "npm run build && npm run mocha",
     "format": "prettier-eslint --write '**/src/**/*.js' '**/ui/**/*.jsx'",
     "prepublishOnly": "npm run test"

src/stores/globalStore.js

@@ -1 +1,8 @@
+/**
+ * Global Store use in calculateState
+ * when themePath and global path not sync will rollback to use prev state.
+ *
+ * https://github.com/react-atomic/reshow/blob/master/packages/reshow-return/src/returnOptions.js#L55-L63
+ */
+
 export const globalStore = {};

ui/molecules/Reshow.jsx

@@ -50,19 +50,26 @@ class Reshow extends PureComponent {
   }
 
   getPath() {
-    return this.resetGlobalPath();
+    const {themePath, defaultThemePath} = this.props;
+    return this.resetGlobalPath() || themePath || defaultThemePath;
   }
 
+  /**
+   * @see globalStore https://github.com/react-atomic/reshow/blob/master/src/stores/globalStore.js
+   */
   resetGlobalPath(path) {
     if (path) {
       setTimeout(() => dispatch({ themePath: path }));
     } else {
-      path = pageStore.getThemePath() || this.props.themePath;
+      path = pageStore.getThemePath();
     }
     globalStore.path = path;
     return globalStore.path;
   }
 
+  /**
+   * @see globalStore https://github.com/react-atomic/reshow/blob/master/src/stores/globalStore.js
+   */
   getGlobalPath() {
     return globalStore.path;
   }

ui/organisms/__tests__/SectionTest.js

@@ -116,7 +116,7 @@ describe('Test Section', () => {
     setTimeout(() => {
       expect(wrap.el.getAttribute('name')).to.equal('test');
       done();
-    });
+    }, 10);
   });
 
   it('not pass name if child already have name', done => {
@@ -173,6 +173,6 @@ describe('Test Section', () => {
       expect(uObj.el1.getAttribute('name')).to.be.null;
       expect(uObj.el2.getAttribute('name')).to.equal('test2');
       done();
-    });
+    }, 10);
   });
 });