Modify

kuu12 · Aug 27, 2018 · cf50081 · cf50081
1 parent c9eb539
commit cf50081
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 28 deletions.
diff --git a/demo/dynamic.jsx b/demo/dynamic.jsx
@@ -1,11 +1,18 @@
 import React from 'react';
 import Routing from '../src';
 import Child from './child';
+import Log from './log';
 
 const Dynamic = ({ router, path, pathname }) => (
   <div id="dynamic">
-
     <Child parentPath={path} path="/child" />
+    <button
+      name="dynamic-child"
+      onClick={() => router.push(`${pathname}/child`)}
+    >
+      Show Child
+    </button>
+    <Log id="dynamic" data={{ router, path, pathname }} />
   </div>
 );
 

diff --git a/demo/log.js b/demo/log.js
@@ -2,7 +2,7 @@ import React from 'react';
 
 const Log = ({ id, data }) => {
     Log[id] = data;
-    return <div></div>;
+    return null;
 };
 
 export default Log;
diff --git a/test/cache.test.js → test/exclusive-cache.test.js b/test/cache.test.js → test/exclusive-cache.test.js
@@ -4,6 +4,8 @@ import Routing from '../src';
 import proxy from '../src/proxy';
 import { delay } from './util';
 
+const log = (...args) => false && console.log(...args);
+
 let count = 0;
 
 class Aaa extends React.Component {
@@ -47,11 +49,11 @@ const Root = <ABRoute />;
 ReactDOM.render(Root, root);
 
 test('init', () => {
-    console.log(proxy.router.pathname);
-    console.log(root.innerHTML);
-    console.log(JSON.stringify(proxy.router.cache));
-    console.log(JSON.stringify(proxy.router.registeredRoutes));
-    console.log('\n');
+    log(proxy.router.pathname);
+    log(root.innerHTML);
+    log(JSON.stringify(proxy.router.cache));
+    log(JSON.stringify(proxy.router.registeredRoutes));
+    log('\n');
     expect(document.getElementById('aaa'))
         .toBeFalsy();
     expect(document.getElementById('bbb'))
@@ -63,11 +65,11 @@ describe('exclusive route', () => {
         proxy.router.push('/aaa');
     });
     test('route rendering', () => {
-        console.log(proxy.router.pathname);
-        console.log(root.innerHTML);
-        console.log(JSON.stringify(proxy.router.cache));
-        console.log(JSON.stringify(proxy.router.registeredRoutes));
-        console.log('\n');
+        log(proxy.router.pathname);
+        log(root.innerHTML);
+        log(JSON.stringify(proxy.router.cache));
+        log(JSON.stringify(proxy.router.registeredRoutes));
+        log('\n');
         expect(document.getElementById('aaa'))
             .toBeInstanceOf(HTMLElement);
         expect(document.getElementById('bbb'))
@@ -81,11 +83,11 @@ describe('route change', () => {
         await delay(500);
     });
     test('route rendering', () => {
-        console.log(proxy.router.pathname);
-        console.log(root.innerHTML);
-        console.log(JSON.stringify(proxy.router.cache));
-        console.log(JSON.stringify(proxy.router.registeredRoutes));
-        console.log('\n');
+        log(proxy.router.pathname);
+        log(root.innerHTML);
+        log(JSON.stringify(proxy.router.cache));
+        log(JSON.stringify(proxy.router.registeredRoutes));
+        log('\n');
         const parent = document
             .getElementById('aaa')
             .parentNode;
@@ -105,12 +107,12 @@ describe('back', () => {
         await delay(500);
     });
     test('no remount', () => {
-        console.log(proxy.router.pathname);
-        console.log(root.innerHTML);
-        console.log(JSON.stringify(proxy.router.cache));
-        console.log(JSON.stringify(proxy.router.registeredRoutes));
-        console.log('\n');
-        console.log(proxy.router.props.Component);
+        log(proxy.router.pathname);
+        log(root.innerHTML);
+        log(JSON.stringify(proxy.router.cache));
+        log(JSON.stringify(proxy.router.registeredRoutes));
+        log('\n');
+        log(proxy.router.props.Component);
         expect(count).toBe(1);
     });
 });
@@ -123,11 +125,11 @@ describe('clear cache', () => {
         await delay(500);
     });
     test('remount', () => {
-        console.log(proxy.router.pathname);
-        console.log(root.innerHTML);
-        console.log(JSON.stringify(proxy.router.cache));
-        console.log(JSON.stringify(proxy.router.registeredRoutes));
-        console.log('\n');
+        log(proxy.router.pathname);
+        log(root.innerHTML);
+        log(JSON.stringify(proxy.router.cache));
+        log(JSON.stringify(proxy.router.registeredRoutes));
+        log('\n');
         expect(count).toBe(2);
     });
 });