replace ember addon with ember new -b addon

Author: Kelly Selden

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

@@ -41,17 +41,19 @@ module.exports = function getStartAndEndCommands({
 function buildCommand(projectName, blueprint) {
   let isCustomBlueprint = blueprint.name !== 'ember-cli';
 
-  let command = 'new';
-  if (blueprint.type === 'addon') {
-    command = 'addon';
-  }
-
-  command += ` ${projectName} -sn -sg`;
+  let command = `new ${projectName} -sn -sg`;
 
+  let blueprintPath;
   if (isCustomBlueprint) {
-    command += ` -b ${blueprint.path}`;
+    blueprintPath = blueprint.path;
+  } else if (blueprint.type === 'addon') {
+    blueprintPath = 'addon';
+  } else {
+    blueprintPath = 'app';
   }
 
+  command += ` -b ${blueprintPath}`;
+
   if (blueprint.options.length) {
     command += ` ${blueprint.options.join(' ')}`;
   }

src/load-safe-default-blueprint.js

@@ -10,7 +10,7 @@ function loadSafeDefaultBlueprint(projectOptions, version) {
   if (projectOptions.includes('yarn')) {
     options.push('--yarn');
   }
-  if (!projectOptions.includes('welcome') && !projectOptions.includes('addon')) {
+  if (!projectOptions.includes('welcome') || projectOptions.includes('addon')) {
     options.push('--no-welcome');
   }
 

test/integration/load-safe-default-blueprint-test.js

@@ -98,7 +98,9 @@ describe(_loadSafeDefaultBlueprint, function() {
         name: 'ember-cli',
         type: 'addon',
         version,
-        options: []
+        options: [
+          '--no-welcome'
+        ]
       });
     });
 
@@ -112,7 +114,8 @@ describe(_loadSafeDefaultBlueprint, function() {
         type: 'addon',
         version,
         options: [
-          '--yarn'
+          '--yarn',
+          '--no-welcome'
         ]
       });
     });

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

@@ -98,7 +98,9 @@ describe(_getStartAndEndCommands, function() {
         'new',
         projectName,
         '-sn',
-        '-sg'
+        '-sg',
+        '-b',
+        'app'
       ],
       {
         cwd
@@ -122,7 +124,7 @@ describe(_getStartAndEndCommands, function() {
     expect(await createProject(cwd)).to.equal(projectPath);
 
     expect(npxStub.args).to.deep.equal([[
-      `-p ${packageName}@${packageVersion} ${commandName} new ${projectName} -sn -sg`,
+      `-p ${packageName}@${packageVersion} ${commandName} new ${projectName} -sn -sg -b app`,
       {
         cwd
       }
@@ -293,7 +295,7 @@ describe(_getStartAndEndCommands, function() {
       expect(await createProject(cwd)).to.equal(projectPath);
 
       expect(npxStub.args).to.deep.equal([[
-        `-p ${packageName}@${packageVersion} ${commandName} new ${projectName} -sn -sg`,
+        `-p ${packageName}@${packageVersion} ${commandName} new ${projectName} -sn -sg -b app`,
         {
           cwd
         }
@@ -401,7 +403,7 @@ describe(_getStartAndEndCommands, function() {
 
       let command = buildCommand(projectName, blueprint);
 
-      expect(command).to.equal('new my-project -sn -sg');
+      expect(command).to.equal('new my-project -sn -sg -b app');
     });
 
     it('works for default addon', function() {
@@ -413,7 +415,7 @@ describe(_getStartAndEndCommands, function() {
 
       let command = buildCommand(projectName, blueprint);
 
-      expect(command).to.equal('addon my-project -sn -sg');
+      expect(command).to.equal('new my-project -sn -sg -b addon');
     });
 
     it('works for custom app', function() {
@@ -440,7 +442,7 @@ describe(_getStartAndEndCommands, function() {
 
       let command = buildCommand(projectName, blueprint);
 
-      expect(command).to.equal('new my-project -sn -sg --my-option-1 --my-option-2');
+      expect(command).to.equal('new my-project -sn -sg -b app --my-option-1 --my-option-2');
     });
   });
 });