Test client npm and running test coverage from doc

agencyenterprise · May 8, 2019 · f992f09 · f992f09
1 parent 844ecea
commit f992f09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -49,12 +49,8 @@ jobs:
               set -ou pipefail
               npm i
               npm run generator
-              cd client
-              npm i
-              npm install -S redux github:wgrisa/redux-thunk-actions react-redux redux-thunk react-router-dom axios platform qs store query-string typescript
-              npm install -D coveralls enzyme enzyme-adapter-react-16 axios-mock-adapter redux-mock-store prettier tslint tslint-config-prettier tslint-consistent-codestyle redux-devtools-extension redux-actions
-              npm install -D @types/node @types/react @types/react-dom @types/jest @types/react-redux @types/react-router-dom @types/platform @types/qs @types/store @types/query-string
-              npm run test-coverage
+              cat ./client/package.json
+              docker-compose run --rm site npm run test-coverage
             fi
       - restore_cache:
           keys:

diff --git a/generator/src/install-dependencies.ts b/generator/src/install-dependencies.ts
@@ -4,7 +4,7 @@ import { clientAppPath } from './core/config'
 
 export const installDependencies = () => {
   return new Promise((resolve) => {
-    shell.exec(`npm run client-npm i`)
+    shell.exec(`npm run client-npm -- i`)
 
     const dependencies = [
       'redux',
@@ -43,8 +43,8 @@ export const installDependencies = () => {
       '@types/jest',
     ]
 
-    shell.exec(`npm run client-npm i -- -S ${dependencies.join(' ')}`)
-    shell.exec(`npm run client-npm i -- -D --unsafe-perm ${devDependencies.join(' ')}`)
+    shell.exec(`npm run client-npm -- i -S ${dependencies.join(' ')}`)
+    shell.exec(`npm run client-npm -- i -D --unsafe-perm ${devDependencies.join(' ')}`)
 
     shell.cd(`${clientAppPath}`)
     shell.exec(`npm i node-sass -D`)