chore: #1997 update snapshots

reapit · Jul 14, 2020 · 468bfc9 · 468bfc9
1 parent 3948f1f
commit 468bfc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 31 deletions.
diff --git a/packages/developer-portal/src/core/__tests__/__snapshots__/private-route.tsx.snap b/packages/developer-portal/src/core/__tests__/__snapshots__/private-route.tsx.snap
@@ -18,7 +18,7 @@ exports[`PrivateRouter should match a snapshot 1`] = `
       Array [
         Object {
           "key": "developerAppsRoute",
-          "pathname": "/developer",
+          "pathname": "/",
         },
       ]
     }
@@ -34,7 +34,7 @@ exports[`PrivateRouter should match a snapshot 1`] = `
             Object {
               "hash": "",
               "key": "developerAppsRoute",
-              "pathname": "/developer",
+              "pathname": "/",
               "search": "",
             },
           ],
@@ -47,7 +47,7 @@ exports[`PrivateRouter should match a snapshot 1`] = `
           "location": Object {
             "hash": "",
             "key": "developerAppsRoute",
-            "pathname": "/developer",
+            "pathname": "/",
             "search": "",
           },
           "push": [Function],

diff --git a/packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap b/packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap
@@ -29,17 +29,7 @@ exports[`Router should match a snapshot 1`] = `
       <Switch>
         <Route
           exact={true}
-<<<<<<< HEAD
-          path="/developer/login"
-=======
-          path={
-            Array [
-              "/login",
-              "/admin/login",
-              "/client/login",
-            ]
-          }
->>>>>>> chore: #1997 remove /developer prefix in developer-portal routes
+          path="/login"
           render={[Function]}
         />
         <Route
@@ -215,23 +205,6 @@ exports[`Router should match a snapshot 1`] = `
                   "_status": -1,
                 }
               }
-<<<<<<< HEAD
-=======
-              exact={true}
-              fetcher={true}
-              path="/settings/"
-            />
-            <Component
-              allow="DEVELOPER"
-              component={
-                Object {
-                  "$$typeof": Symbol(react.lazy),
-                  "_ctor": [Function],
-                  "_result": null,
-                  "_status": -1,
-                }
-              }
->>>>>>> chore: #1997 remove /developer prefix in developer-portal routes
               fetcher={true}
               path="/settings/billing"
             />