#3087: standardize path to 'jest.config.js'

jeff1evesque · May 29, 2018 · cdc4072 · cdc4072
1 parent 22607b9
commit cdc4072
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/dockerfile/browserify.dockerfile b/dockerfile/browserify.dockerfile
@@ -4,8 +4,9 @@ FROM node:9
 ENV ROOT_PROJECT /var/machine-learning
 
 ## source + asset directory
-RUN mkdir -p $ROOT_PROJECT/src/jsx $ROOT_PROJECT/interface/static/js $ROOT_PROJECT/src/jsx/dockerfile
-COPY src/jsx test/jest/setup.js test/jest/jest.config.js $ROOT_PROJECT/src/jsx/
+RUN mkdir -p $ROOT_PROJECT/src/jsx $ROOT_PROJECT/interface/static/js $ROOT_PROJECT/src/jsx/dockerfile $ROOT_PROJECT/test/jest
+COPY src/jsx $ROOT_PROJECT/src/jsx/
+COPY test/jest/setup.js test/jest/jest.config.js test/jest/
 COPY test/jest/__tests__ $ROOT_PROJECT/src/jsx/__tests__
 COPY dockerfile/browserify.dockerfile src/jsx/dockerfile/browserify.dockerfile
 

diff --git a/src/jsx/package.json b/src/jsx/package.json
@@ -7,8 +7,8 @@
     "build:browserify": "browserify -t [ babelify --presets env,stage-2,react ] content.jsx > ../../interface/static/js/content.js",
     "prebuild:dos2unix": "find . -type f -print0 | xargs -0 dos2unix",
     "watch:jsx": "onchange 'src/jsx/**/*.jsx' 'src/jsx/**/*.js' -- npm run build:browserify",
-    "test": "NODE_ENV=test jest --config jest.config.js",
-    "test:coveralls": "NODE_ENV=test jest --config ../../test/jest/jest.config.js --coverage --coverageReporters=text-lcov | coveralls"
+    "test": "NODE_ENV=test jest --config ../../test/jest/jest.config.js",
+    "test:coveralls": "npm run test --coverage --coverageReporters=text-lcov | coveralls"
   },
   "author": "Jeffrey Levesque",
   "license": "BSD",