fix: getRoutes async patch (umijs#54)

* chore: add routes config test cases * fix: await patchRoutes * fix: routes test case * chore: rename test case name
xierenyuan · Feb 13, 2020 · 0b23612 · 0b23612
1 parent 36cb4fa
commit 0b23612
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 1 deletion.
diff --git a/packages/core/src/Route/Route.test.ts b/packages/core/src/Route/Route.test.ts
@@ -13,6 +13,64 @@ test('config empty', async () => {
   ).toEqual([]);
 });
 
+test('config routes', async () => {
+  const route = new Route();
+  expect(
+    await route.getRoutes({
+      config: {
+        routes: [
+          {
+            path: '/',
+            component: '../layouts/SecurityLayout',
+            routes: [
+              {
+                path: '/',
+                component: '../layouts/BasicLayout',
+                routes: [
+                  {
+                    path: '/',
+                    redirect: '/welcome',
+                  },
+                  { component: './404' },
+                ],
+              },
+              { component: './404' },
+            ],
+          },
+          { component: './404' },
+        ],
+      },
+      root: '/tmp',
+    }),
+  ).toEqual([
+    {
+      path: '/',
+      component: '/layouts/SecurityLayout',
+      routes: [
+        {
+          path: '/',
+          component: '/layouts/BasicLayout',
+          routes: [
+            {
+              path: '/',
+              redirect: '/welcome',
+            },
+            {
+              component: '/tmp/404',
+            },
+          ],
+        },
+        {
+          component: '/tmp/404',
+        },
+      ],
+    },
+    {
+      component: '/tmp/404',
+    },
+  ]);
+});
+
 test('conventional normal', async () => {
   const route = new Route();
   expect(

diff --git a/packages/core/src/Route/Route.ts b/packages/core/src/Route/Route.ts
@@ -71,7 +71,7 @@ class Route {
     }
 
     if (route.routes) {
-      this.patchRoutes(route.routes, opts);
+      await this.patchRoutes(route.routes, opts);
     }
 
     // resolve component path