Merge 74c72bf into 120dd9d

salesforce · Mar 9, 2018 · 093a4e6 · 093a4e6
2 parents 120dd9d + 74c72bf
commit 093a4e6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,6 @@
     "chai-as-promised": "^7.1.1",
     "commander": "^2.12.2",
     "coveralls": "^3.0.0",
-    "fs-extra": "^4.0.3",
     "joi": "^10.6.0",
     "jscs": "^3.0.7",
     "mock-fs": "^4.4.2",
@@ -29,6 +28,7 @@
     "@salesforce/refocus-collector-eval": "*",
     "chai": "*",
     "chai-url": "*",
+    "fs-extra": "4.*",
     "istanbul": "*",
     "mocha": "*"
   },

diff --git a/src/resourceGenUtils.js b/src/resourceGenUtils.js
@@ -35,7 +35,7 @@ const scriptsToAdd = {
   build: 'sgtu-build',
   deploy: 'sgtu-deploy',
   'template-init': 'sgtu-init',
-  test: 'istanbul cover ./node_modules/mocha/bin/_mocha ' +
+  test: './node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha ' +
     '--report lcovonly -- -R dot transform/testTransform.js connection/testConnection.js ',
   'test-connection': './node_modules/mocha/bin/_mocha ' +
     ' connection/testConnection.js',

diff --git a/test/bin/generateResources.js b/test/bin/generateResources.js
@@ -38,7 +38,7 @@ describe('test/bin/generateResources.js >', () => {
         'testUtils.js',
       ]);
       expect(fs.readdirSync(`./${projectName}/node_modules`)).to.have.members([
-        '@salesforce', 'chai', 'chai-url', 'istanbul', 'mocha',
+        '@salesforce', 'chai', 'chai-url', 'fs-extra', 'istanbul', 'mocha',
       ]);
 
       done();

diff --git a/test/src/resourceGenUtils.js b/test/src/resourceGenUtils.js
@@ -190,6 +190,7 @@ describe('test/src/resourceGenUtils.js >', () => {
           '@salesforce': mockDir('./node_modules/@salesforce'),
           chai: mockDir('./node_modules/chai'),
           'chai-url': mockDir('./node_modules/chai-url'),
+          'fs-extra': mockDir('./node_modules/fs-extra'),
           istanbul: mockDir('./node_modules/istanbul'),
           mocha: mockDir('./node_modules/mocha'),
         },
@@ -202,11 +203,11 @@ describe('test/src/resourceGenUtils.js >', () => {
 
     it('packages are copied', () => {
       expect(fs.readdirSync('./my-project/node_modules')).to.not.have.members([
-        '@salesforce', 'chai', 'chai-url', 'istanbul', 'mocha',
+        '@salesforce', 'chai', 'chai-url', 'fs-extra', 'istanbul', 'mocha',
       ]);
       rgu.copyPackages();
       expect(fs.readdirSync('./my-project/node_modules')).to.have.members([
-        '@salesforce', 'chai', 'chai-url', 'istanbul', 'mocha',
+        '@salesforce', 'chai', 'chai-url', 'fs-extra', 'istanbul', 'mocha',
       ]);
     });
   });
@@ -227,8 +228,8 @@ describe('test/src/resourceGenUtils.js >', () => {
         'scripts', 'keywords', 'author', 'license'
       );
       expect(contents.dependencies).to.have.keys(
-        '@salesforce/refocus-collector-eval', 'chai', 'chai-url', 'istanbul',
-        'mocha'
+        '@salesforce/refocus-collector-eval', 'chai', 'chai-url', 'fs-extra',
+        'istanbul', 'mocha'
       );
       expect(contents.scripts).to.have.keys(
         'test', 'build', 'deploy', 'template-init', 'test-connection',