Fixed Integration-Tests

This commit is contained in:
Christoph Oberhofer
2016-02-25 23:10:52 +01:00
parent 3c020d04bf
commit 0ed588ecb5
7 changed files with 31 additions and 23 deletions
+5 -5
View File
File diff suppressed because one or more lines are too long
+3 -3
View File
File diff suppressed because one or more lines are too long
+13 -6
View File
@@ -1,4 +1,5 @@
var path = require('path'); var path = require('path');
var webpack = require('webpack');
module.exports = function(config) { module.exports = function(config) {
config.set({ config.set({
@@ -25,12 +26,18 @@ module.exports = function(config) {
] ]
}, },
resolve: { resolve: {
extensions: ['', '.js', '.jsx'], extensions: ['', '.js', '.jsx'],
alias: { root: path.resolve(__dirname),
'input_stream$': path.resolve(__dirname, 'src/input_stream'), alias: {
'frame_grabber$': path.resolve(__dirname, 'src/frame_grabber') 'input_stream$': 'src/input/input_stream',
} 'frame_grabber$': 'src/input/frame_grabber'
} }
},
plugins: [
new webpack.DefinePlugin({
ENV: require(path.join(__dirname, './env/production'))
})
]
}, },
plugins: [ plugins: [
'karma-chrome-launcher', 'karma-chrome-launcher',
+3 -2
View File
@@ -33,9 +33,10 @@ module.exports = function(config) {
}, },
resolve: { resolve: {
extensions: ['', '.js', '.jsx'], extensions: ['', '.js', '.jsx'],
root: path.resolve(__dirname),
alias: { alias: {
'input_stream$': path.resolve(__dirname, 'src/input_stream'), 'input_stream$': 'src/input/input_stream',
'frame_grabber$': path.resolve(__dirname, 'src/frame_grabber') 'frame_grabber$': 'src/input/frame_grabber'
} }
}, },
}, },
+3 -3
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -34,8 +34,8 @@ module.exports = {
halfSample: true, halfSample: true,
patchSize: "medium", // x-small, small, medium, large, x-large patchSize: "medium", // x-small, small, medium, large, x-large
debug: { debug: {
showCanvas: true, showCanvas: false,
showPatches: true, showPatches: false,
showFoundPatches: false, showFoundPatches: false,
showSkeleton: false, showSkeleton: false,
showLabels: false, showLabels: false,
+2 -2
View File
@@ -42,7 +42,7 @@ export default {
initConfig(); initConfig();
function initCanvas() { function initCanvas() {
if (typeof document !== 'undefined') { if (ENV.development && typeof document !== 'undefined') {
var $debug = document.querySelector("#debug.detection"); var $debug = document.querySelector("#debug.detection");
_canvas.dom.frequency = document.querySelector("canvas.frequency"); _canvas.dom.frequency = document.querySelector("canvas.frequency");
if (!_canvas.dom.frequency) { if (!_canvas.dom.frequency) {
@@ -91,7 +91,7 @@ export default {
} }
function initConfig() { function initConfig() {
if (typeof document !== 'undefined') { if (ENV.development && typeof document !== 'undefined') {
var i, var i,
vis = [{ vis = [{
node: _canvas.dom.frequency, node: _canvas.dom.frequency,