Skip to content
Snippets Groups Projects
Commit 18902aee authored by Tom Robinson's avatar Tom Robinson
Browse files

Fix frontend tests and scripts

parent 876fb39f
No related branches found
No related tags found
No related merge requests found
'use strict';
var webpackConfig = require('../../../webpack.config');
var webpackConfig = require('../../webpack.config');
webpackConfig.module.postLoaders = [
{ test: /\.js$/, exclude: /(\.spec\.js|vendor|node_modules)/, loader: 'istanbul-instrumenter' }
];
......@@ -9,9 +9,9 @@ module.exports = function(config) {
config.set({
basePath: '../',
files: [
'app/dist/vendor.bundle.js',
'app/dist/app.bundle.js',
'../../node_modules/angular-mocks/angular-mocks.js',
'../resources/frontend_client/app/dist/vendor.bundle.js',
'../resources/frontend_client/app/dist/app.bundle.js',
'../node_modules/angular-mocks/angular-mocks.js',
'test/unit/**/*.spec.js'
],
exclude: [
......@@ -31,7 +31,7 @@ module.exports = function(config) {
module: webpackConfig.module
},
coverageReporter: {
dir: '../../coverage/',
dir: '../coverage/',
subdir: function(browser) {
return browser.toLowerCase().split(/[ /-]/)[0];
},
......
......@@ -78,13 +78,13 @@
"webpack-postcss-tools": "^1.1.1"
},
"scripts": {
"lint": "./node_modules/eslint/bin/eslint.js --ignore-pattern 'resources/frontend_client/app/dist/**/*' resources/frontend_client/app",
"test": "./node_modules/karma/bin/karma start resources/frontend_client/test/karma.conf.js --single-run --reporters nyan",
"test-watch": "./node_modules/karma/bin/karma start resources/frontend_client/test/karma.conf.js --auto-watch --reporters nyan",
"test-e2e": "./node_modules/protractor/bin/webdriver-manager update && ./node_modules/protractor/bin/protractor resources/frontend_client/test/protractor-conf.js",
"lint": "./node_modules/eslint/bin/eslint.js frontend/app",
"test": "./node_modules/karma/bin/karma start frontend/test/karma.conf.js --single-run --reporters nyan",
"test-watch": "./node_modules/karma/bin/karma start frontend/test/karma.conf.js --auto-watch --reporters nyan",
"test-e2e": "./node_modules/protractor/bin/webdriver-manager update && ./node_modules/protractor/bin/protractor frontend/test/protractor-conf.js",
"build": "./node_modules/webpack/bin/webpack.js",
"build-watch": "./node_modules/webpack/bin/webpack.js --watch",
"build-hot": "NODE_ENV=hot ./node_modules/webpack/bin/webpack.js && NODE_ENV=hot node_modules/webpack-dev-server/bin/webpack-dev-server.js --hot --inline --content-base resources/frontend_client",
"start": "lein ring server"
"build-hot": "NODE_ENV=hot ./node_modules/webpack/bin/webpack.js && NODE_ENV=hot node_modules/webpack-dev-server/bin/webpack-dev-server.js --hot --inline --content-base frontend",
"start": "npm run build && lein ring server"
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment