diff --git a/karma.conf.js b/karma.conf.js index 89d0059d2012dde0c4f4cf466f76915babfc8b9a..22a1e5990330ac1ef9d6632e6deb817abb834c8a 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -20,11 +20,11 @@ module.exports = function (config) { frameworks: ['mocha'], // this is the entry file for all our tests. files: [ - './test/index.js' + './test/index.js', ], // we will pass the entry file to webpack for bundling. preprocessors: { - './test/index.js': [ 'webpack', 'sourcemap' ], + '**/*': [ 'webpack', 'sourcemap' ], }, reporters: [ 'mocha', diff --git a/src/main.jsx b/main.jsx similarity index 76% rename from src/main.jsx rename to main.jsx index 3c443607a9507edce0e19c06115e6e1ccb576e43..bdea091ba9fe0de426e912c102724a0980617683 100644 --- a/src/main.jsx +++ b/main.jsx @@ -6,8 +6,8 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { Provider } from 'react-redux'; import { AppContainer } from 'react-hot-loader'; -import App from './components/App.jsx'; -import store from './store'; +import App from './src/components/App.jsx'; +import store from '@store'; ReactDOM.render( <AppContainer> @@ -20,8 +20,8 @@ ReactDOM.render( // Hot Module Replacement API if (module.hot) { - module.hot.accept('./components/App', () => { - const NextApp = require('./components/App').default; + module.hot.accept('./src/components/App', () => { + const NextApp = require('./src/components/App').default; ReactDOM.render( <AppContainer> <Provider store={ store }> diff --git a/test/Foo.jsx b/src/Foo.jsx similarity index 86% rename from test/Foo.jsx rename to src/Foo.jsx index 4670849e06b2fd9b93a3f6b3c7b27db14d0341c3..27fcec351e85a494b3e0a2eeb20f7dd49672c4f9 100644 --- a/test/Foo.jsx +++ b/src/Foo.jsx @@ -21,6 +21,10 @@ class Foo extends React.Component<FooProps, FooState> { ); } + isntCovered = () => { + console.log(`mauahahahahah`); + } + componentDidMount(){} } diff --git a/test/index.js b/test/index.js index 28167f0c7684b1c68249407c57f2decbf4d3bf32..d532d04818ab261de92353eeea03bbb969b526e3 100644 --- a/test/index.js +++ b/test/index.js @@ -1,3 +1,7 @@ +import { configure } from 'enzyme'; +import Adapter from 'enzyme-adapter-react-16'; +configure({ adapter: new Adapter() }); + // require all test files using special Webpack feature // https://webpack.js.org/guides/dependency-management/#require-context const testsContext = require.context('.', true, /\.spec.js(x)?$/); diff --git a/test/test.spec.jsx b/test/test.spec.jsx index 0e0d6afd0ea2cef111c45122ce8f09b816fd6b58..baf72eae9293e0383d929eefa51bffb0de4f1729 100644 --- a/test/test.spec.jsx +++ b/test/test.spec.jsx @@ -1,12 +1,9 @@ // @flow import React from 'react'; import { expect } from 'chai'; -import { configure, mount } from 'enzyme'; -import Adapter from 'enzyme-adapter-react-16'; +import { mount } from 'enzyme'; import sinon from 'sinon'; -import Foo from './Foo.jsx'; - -configure({ adapter: new Adapter() }); +import Foo from '../src/Foo.jsx'; describe('<Foo />', () => { it('calls componentDidMount', () => { diff --git a/webpack.config.js b/webpack.config.js index a8193fa207e56f5dc9a26cea5f29647ab2f7377d..cd4d61f580660dff1910a7d68e0a9e025f895a60 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,7 +14,7 @@ module.exports = { main: [ 'react-hot-loader/patch', // all our code starts here - './src/main.jsx', + './main.jsx', ] },