diff --git a/.travis.yml b/.travis.yml index d4710b1..b57edb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,8 @@ before_script: script: - npm test || travis_terminate 1 - - npm run dist - -after_script: - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT + - npm run dist branches: except: diff --git a/src/renderer/pages/index.jsx b/src/renderer/pages/index.jsx index 2eae45f..8134425 100644 --- a/src/renderer/pages/index.jsx +++ b/src/renderer/pages/index.jsx @@ -10,9 +10,25 @@ import Accounts from '../components/Home/Accounts' import IconCog from '../images/cog.svg' import styles from './index.module.css' -export default function Home() { +function MainContent() { const { isLoading, error, needsConfig } = useContext(AppContext) + return needsConfig ? ( + + ) : error ? ( +
{error}
+ ) : isLoading ? ( + + ) : ( + <> + + + + + ) +} + +export default function Home() { return ( <>
@@ -22,22 +38,10 @@ export default function Home() { - {needsConfig ? ( - - ) : error ? ( -
{error}
- ) : isLoading ? ( - - ) : ( - <> - - - - - )} +
- + ) } diff --git a/tests/jest.config.js b/tests/jest.config.js index 86325c2..d10dc25 100644 --- a/tests/jest.config.js +++ b/tests/jest.config.js @@ -22,11 +22,13 @@ module.exports = { setupFilesAfterEnv: ['/tests/setupTests.js'], runner: '@jest-runner/electron', testEnvironment: '@jest-runner/electron/environment', - coverageDirectory: '../../coverage/', + coverageDirectory: '/coverage/', collectCoverage: true, collectCoverageFrom: [ - '/src/renderer/**/*.jsx', - '!/dist', + '/src/renderer/**/*.{js,jsx}', + '!/src/renderer/next.config.js', + '!/src/renderer/out/**/*', + '!/src/renderer/.next/**/*', '!**/node_modules/**' ] }