consolidate overwriteBlueprintFiles calls

Author: Kelly Selden

src/get-start-and-end-commands.js

@@ -123,39 +123,31 @@ function getArgs({
   ];
 }
 
-module.exports.spawn = async function spawn(command, args, options) {
+module.exports.spawn = function spawn(command, args, options) {
   debug(`${command} ${args.join(' ')}`);
 
-  let ps = execa(command, args, {
+  return execa(command, args, {
     stdio: ['pipe', 'pipe', 'inherit'],
     ...options
   });
-
-  overwriteBlueprintFiles(ps);
-
-  await ps;
 };
 
-module.exports.npx = async function npx(args, options) {
-  let ps = utils.npx(args.join(' '), options);
-
-  overwriteBlueprintFiles(ps);
-
-  await ps;
+module.exports.npx = function npx(args, options) {
+  return utils.npx(args.join(' '), options);
 };
 
-async function runEmberLocally({
+function runEmberLocally({
   packageRoot,
   cwd,
   args
 }) {
-  await module.exports.spawn('node', [
+  return module.exports.spawn('node', [
     path.join(packageRoot, 'bin/ember'),
     ...args
   ], { cwd });
 }
 
-async function runEmberRemotely({
+function runEmberRemotely({
   cwd,
   blueprint,
   args
@@ -169,7 +161,7 @@ async function runEmberRemotely({
     args = ['-p', `ember-cli@${blueprint.version}`, 'ember', ...args];
   }
 
-  await module.exports.npx(args, { cwd });
+  return module.exports.npx(args, { cwd });
 }
 
 function createProject(runEmber) {
@@ -196,12 +188,16 @@ function createProject(runEmber) {
           blueprint
         });
 
-        await runEmber({
+        let ps = runEmber({
           packageRoot,
           cwd: _cwd,
           blueprint,
           args
         });
+
+        module.exports.overwriteBlueprintFiles(ps);
+
+        await ps;
       }
 
       if (!blueprint || !blueprint.isBaseBlueprint) {
@@ -278,3 +274,4 @@ async function appendNodeModulesIgnore({
 
 module.exports.appendNodeModulesIgnore = appendNodeModulesIgnore;
 module.exports.getArgs = getArgs;
+module.exports.overwriteBlueprintFiles = overwriteBlueprintFiles;

test/unit/get-start-and-end-commands-test.js

@@ -33,13 +33,15 @@ describe(_getStartAndEndCommands, function() {
   let npxStub;
   let spawnStub;
   let readdirStub;
+  let overwriteBlueprintFilesStub;
   let installAddonBlueprintStub;
   let appendNodeModulesIgnoreStub;
 
   beforeEach(function() {
-    npxStub = sinon.stub(_getStartAndEndCommands, 'npx').resolves();
-    spawnStub = sinon.stub(_getStartAndEndCommands, 'spawn').resolves();
+    npxStub = sinon.stub(_getStartAndEndCommands, 'npx').returns('test npx');
+    spawnStub = sinon.stub(_getStartAndEndCommands, 'spawn').returns('test spawn');
     readdirStub = sinon.stub(utils, 'readdir').resolves(['foo']);
+    overwriteBlueprintFilesStub = sinon.stub(_getStartAndEndCommands, 'overwriteBlueprintFiles');
     installAddonBlueprintStub = sinon.stub(_getStartAndEndCommands, 'installAddonBlueprint').resolves();
     appendNodeModulesIgnoreStub = sinon.stub(_getStartAndEndCommands, 'appendNodeModulesIgnore').resolves();
   });
@@ -131,6 +133,8 @@ describe(_getStartAndEndCommands, function() {
         cwd
       }
     ]]);
+
+    expect(overwriteBlueprintFilesStub.args).to.deep.equal([['test spawn']]);
   });
 
   it('can create a partial project from cache', async function() {
@@ -186,6 +190,8 @@ describe(_getStartAndEndCommands, function() {
         }
       ]
     ]);
+
+    expect(overwriteBlueprintFilesStub.args).to.deep.equal([['test spawn'], ['test spawn']]);
   });
 
   it('can create a base project from remote', async function() {
@@ -217,6 +223,8 @@ describe(_getStartAndEndCommands, function() {
         cwd
       }
     ]]);
+
+    expect(overwriteBlueprintFilesStub.args).to.deep.equal([['test npx']]);
   });
 
   it('can create a partial project from remote', async function() {
@@ -271,6 +279,8 @@ describe(_getStartAndEndCommands, function() {
         }
       ]
     ]);
+
+    expect(overwriteBlueprintFilesStub.args).to.deep.equal([['test npx'], ['test npx']]);
   });
 
   describe('custom blueprint', function() {
@@ -404,6 +414,8 @@ describe(_getStartAndEndCommands, function() {
         }
       ]]);
 
+      expect(overwriteBlueprintFilesStub.args).to.deep.equal([['test spawn']]);
+
       expect(installAddonBlueprintStub).to.not.be.called;
 
       expect(appendNodeModulesIgnoreStub.args).to.deep.equal([[{
@@ -467,6 +479,8 @@ describe(_getStartAndEndCommands, function() {
         ]
       ]);
 
+      expect(overwriteBlueprintFilesStub.args).to.deep.equal([['test spawn'], ['test spawn']]);
+
       expect(installAddonBlueprintStub).to.not.be.called;
 
       expect(appendNodeModulesIgnoreStub.args).to.deep.equal([[{
@@ -509,6 +523,8 @@ describe(_getStartAndEndCommands, function() {
         }
       ]]);
 
+      expect(overwriteBlueprintFilesStub.args).to.deep.equal([['test npx']]);
+
       expect(installAddonBlueprintStub).to.not.be.called;
 
       expect(appendNodeModulesIgnoreStub.args).to.deep.equal([[{
@@ -569,6 +585,8 @@ describe(_getStartAndEndCommands, function() {
         ]
       ]);
 
+      expect(overwriteBlueprintFilesStub.args).to.deep.equal([['test npx'], ['test npx']]);
+
       expect(installAddonBlueprintStub).to.not.be.called;
 
       expect(appendNodeModulesIgnoreStub.args).to.deep.equal([[{
@@ -618,6 +636,8 @@ describe(_getStartAndEndCommands, function() {
         ]
       ]);
 
+      expect(overwriteBlueprintFilesStub.args).to.deep.equal([['test spawn']]);
+
       expect(installAddonBlueprintStub.args).to.deep.equal([[{
         projectRoot,
         blueprint: {
@@ -669,6 +689,8 @@ describe(_getStartAndEndCommands, function() {
         ]
       ]);
 
+      expect(overwriteBlueprintFilesStub.args).to.deep.equal([['test npx']]);
+
       expect(installAddonBlueprintStub.args).to.deep.equal([[{
         projectRoot,
         blueprint: {