Browse Source

fix App test

Klaudiusz Dembler 4 years ago
parent
commit
55a440646f

+ 2 - 10
packages/app/src/App.tsx

@@ -1,24 +1,16 @@
 import React from 'react'
 import { Provider } from 'react-redux'
-import { Router } from '@reach/router'
 import { ApolloProvider } from '@apollo/client'
 
 import store from './store'
-import { Layout } from './components'
-import { HomeView, VideoView } from './views'
-import routes from './config/routes'
 import { apolloClient } from '@/api'
+import { LayoutWithRouting } from '@/components'
 
 export default function App() {
   return (
     <Provider store={store}>
       <ApolloProvider client={apolloClient}>
-        <Layout>
-          <Router primary={false}>
-            <HomeView default />
-            <VideoView path={routes.video} />
-          </Router>
-        </Layout>
+        <LayoutWithRouting />
       </ApolloProvider>
     </Provider>
   )

+ 0 - 11
packages/app/src/__tests__/App.test.js

@@ -1,11 +0,0 @@
-import React from 'react'
-import { shallow } from 'enzyme'
-import App from '../App'
-
-describe('App component', () => {
-  const component = shallow(<App />)
-
-  it('Should render.', () => {
-    expect(component).toBeDefined()
-  })
-})

+ 11 - 0
packages/app/src/__tests__/LayoutWithRouting.test.js

@@ -0,0 +1,11 @@
+import React from 'react'
+import { shallow } from 'enzyme'
+import { LayoutWithRouting } from '../components'
+
+describe('LayoutWithRouting component', () => {
+  const component = shallow(<LayoutWithRouting />)
+
+  it('Should render.', () => {
+    expect(component).toBeDefined()
+  })
+})

+ 0 - 11
packages/app/src/components/Layout.tsx

@@ -1,11 +0,0 @@
-import React from 'react'
-import { GlobalStyle } from '@/shared/components'
-
-const Layout: React.FC = ({ children }) => (
-  <main>
-    <GlobalStyle />
-    {children}
-  </main>
-)
-
-export default Layout

+ 17 - 0
packages/app/src/components/LayoutWithRouting.tsx

@@ -0,0 +1,17 @@
+import React from 'react'
+import { GlobalStyle } from '@/shared/components'
+import { HomeView, VideoView } from '@/views'
+import routes from '@/config/routes'
+import { Router } from '@reach/router'
+
+const LayoutWithRouting: React.FC = () => (
+  <main>
+    <GlobalStyle />
+    <Router primary={false}>
+      <HomeView default />
+      <VideoView path={routes.video} />
+    </Router>
+  </main>
+)
+
+export default LayoutWithRouting

+ 1 - 1
packages/app/src/components/index.ts

@@ -1,4 +1,4 @@
-export { default as Layout } from './Layout'
+export { default as LayoutWithRouting } from './LayoutWithRouting'
 export { default as VideoGallery } from './VideoGallery'
 export { default as Hero } from './Hero'
 export { default as TagsGallery } from './TagsGallery'