diff --git a/frontend/test/Metamaps/Import.spec.js b/frontend/test/Metamaps/Import.spec.js index 7e4ff0ab..7f438af2 100644 --- a/frontend/test/Metamaps/Import.spec.js +++ b/frontend/test/Metamaps/Import.spec.js @@ -1,10 +1,8 @@ /* global describe, it */ -import chai from 'chai' +import { expect } from 'chai' -import Import from '../src/Metamaps/Import' - -const { expect } = chai +import Import from '../../src/Metamaps/Import.js' describe('Metamaps.Import.js', function() { it('has a topic whitelist', function() { diff --git a/frontend/test/Metamaps/Util.spec.js b/frontend/test/Metamaps/Util.spec.js index 80108ee2..3cfe05d8 100644 --- a/frontend/test/Metamaps/Util.spec.js +++ b/frontend/test/Metamaps/Util.spec.js @@ -1,10 +1,8 @@ /* global describe, it */ -import chai from 'chai' +import { expect } from 'chai' -import Util from '../src/Metamaps/Util' - -const { expect } = chai +import Util from '../../src/Metamaps/Util' describe('Metamaps.Util.js', function() { describe('splitLine', function() { diff --git a/frontend/test/support/dom.js b/frontend/test_support/dom.js similarity index 100% rename from frontend/test/support/dom.js rename to frontend/test_support/dom.js diff --git a/package.json b/package.json index d10064ec..555c8dd0 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "build": "webpack", "build:watch": "webpack --watch", - "test": "mocha-webpack --webpack-config webpack.test.config.js --require frontend/test/support/dom.js frontend/test", + "test": "mocha-webpack --webpack-config webpack.test.config.js --require frontend/test_support/dom.js --recursive frontend/test", "eslint": "eslint frontend", "eslint:fix": "eslint --fix frontend" }, @@ -67,7 +67,6 @@ "jsdom": "^9.11.0", "mocha": "^3.2.0", "mocha-webpack": "^0.7.0", - "react-addons-test-utils": "^15.4.2", "sinon": "^2.2.0" }, "optionalDependencies": { diff --git a/webpack.test.config.js b/webpack.test.config.js index 518835d4..684e2e16 100644 --- a/webpack.test.config.js +++ b/webpack.test.config.js @@ -1,5 +1,13 @@ const config = require('./webpack.config') config.target = 'node' +config.externals = config.externals.concat([ + 'react/lib/ExecutionEnvironment', + 'react/lib/ReactContext', + 'react/addons', + 'react-test-renderer/shallow', + 'react-dom/test-utils', + 'canvas' +]) module.exports = config