use loadSafeDefaultBlueprint in more places

Author: Kelly Selden

src/bootstrap.js

@@ -12,9 +12,7 @@ const loadSafeDefaultBlueprint = require('./load-safe-default-blueprint');
 const stageBlueprintFile = require('./stage-blueprint-file');
 
 module.exports = async function bootstrap() {
-  let defaultBlueprint = {
-    name: 'ember-cli'
-  };
+  let defaultBlueprint = loadSafeDefaultBlueprint();
 
   let cwd = process.cwd();
 

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

@@ -5,6 +5,7 @@ const fs = require('fs-extra');
 const run = require('./run');
 const utils = require('./utils');
 const loadSafeBlueprint = require('./load-safe-blueprint');
+const loadSafeDefaultBlueprint = require('./load-safe-default-blueprint');
 const isDefaultBlueprint = require('./is-default-blueprint');
 
 const nodeModulesIgnore = `
@@ -197,9 +198,7 @@ module.exports.installAddonBlueprint = async function installAddonBlueprint({
   projectName,
   blueprintPath
 }) {
-  let defaultBlueprint = {
-    name: 'ember-cli'
-  };
+  let defaultBlueprint = loadSafeDefaultBlueprint();
 
   let args = getArgs(projectName, loadSafeBlueprint(defaultBlueprint));
 

src/index.js

@@ -41,9 +41,7 @@ module.exports = async function emberCliUpdate({
   createCustomDiff,
   wasRunAsExecutable
 }) {
-  let defaultBlueprint = {
-    name: 'ember-cli'
-  };
+  let defaultBlueprint = loadSafeDefaultBlueprint();
 
   let cwd = process.cwd();
 

src/init.js

@@ -20,9 +20,7 @@ module.exports = async function init({
   blueprintOptions,
   wasRunAsExecutable
 }) {
-  let defaultBlueprint = {
-    name: 'ember-cli'
-  };
+  let defaultBlueprint = loadSafeDefaultBlueprint();
 
   let cwd = process.cwd();
 

src/install.js

@@ -6,15 +6,14 @@ const downloadBlueprint = require('./download-blueprint');
 const saveBlueprint = require('./save-blueprint');
 const loadBlueprintFile = require('./load-blueprint-file');
 const saveDefaultBlueprint = require('./save-default-blueprint');
+const loadSafeDefaultBlueprint = require('./load-safe-default-blueprint');
 
 const toDefault = require('./args').to.default;
 
 module.exports = async function install({
   addon
 }) {
-  let defaultBlueprint = {
-    name: 'ember-cli'
-  };
+  let defaultBlueprint = loadSafeDefaultBlueprint();
 
   let cwd = process.cwd();
 

src/load-safe-default-blueprint.js

@@ -1,6 +1,6 @@
 'use strict';
 
-function loadSafeDefaultBlueprint(projectOptions, version) {
+function loadSafeDefaultBlueprint(projectOptions = [], version) {
   let type = 'app';
   if (projectOptions.includes('addon')) {
     type = 'addon';
@@ -11,6 +11,7 @@ function loadSafeDefaultBlueprint(projectOptions, version) {
     options.push('--yarn');
   }
   if (!projectOptions.includes('welcome') || projectOptions.includes('addon')) {
+    // Why do addons always have --no-welcome?
     options.push('--no-welcome');
   }
 

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

@@ -17,6 +17,19 @@ describe(_loadSafeDefaultBlueprint, function() {
     return _loadSafeDefaultBlueprint(projectOptions, version);
   }
 
+  it('returns blank blueprint if no params', async function() {
+    let blueprint = _loadSafeDefaultBlueprint();
+
+    expect(blueprint).to.deep.equal({
+      name: 'ember-cli',
+      type: 'app',
+      version: undefined,
+      options: [
+        '--no-welcome'
+      ]
+    });
+  });
+
   describe('app', function() {
     beforeEach(function() {
       projectOptions.push('app');

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

@@ -7,6 +7,7 @@ const path = require('path');
 const _getStartAndEndCommands = require('../../src/get-start-and-end-commands');
 const utils = require('../../src/utils');
 const loadSafeBlueprint = require('../../src/load-safe-blueprint');
+const loadSafeDefaultBlueprint = require('../../src/load-safe-default-blueprint');
 
 const {
   getArgs
@@ -23,6 +24,8 @@ const commandName = 'ember';
 const blueprint = 'test-blueprint';
 const blueprintPath = '/path/to/blueprint';
 const projectPath = path.normalize(`${cwd}/${projectName}`);
+const defaultStartBlueprint = loadSafeDefaultBlueprint([], startVersion);
+const defaultEndBlueprint = loadSafeDefaultBlueprint([], endVersion);
 
 describe(_getStartAndEndCommands, function() {
   let sandbox;
@@ -51,14 +54,8 @@ describe(_getStartAndEndCommands, function() {
   function getStartAndEndCommands(options) {
     return _getStartAndEndCommands(Object.assign({
       packageJson: { name: projectName },
-      startBlueprint: {
-        name: 'ember-cli',
-        version: startVersion
-      },
-      endBlueprint: {
-        name: 'ember-cli',
-        version: endVersion
-      }
+      startBlueprint: defaultStartBlueprint,
+      endBlueprint: defaultEndBlueprint
     }, options));
   }
 
@@ -76,17 +73,11 @@ describe(_getStartAndEndCommands, function() {
       packageName,
       commandName,
       startOptions: {
-        blueprint: {
-          name: 'ember-cli',
-          version: startVersion
-        },
+        blueprint: defaultStartBlueprint,
         packageRange: startVersion
       },
       endOptions: {
-        blueprint: {
-          name: 'ember-cli',
-          version: endVersion
-        },
+        blueprint: defaultEndBlueprint,
         packageRange: endVersion
       }
     });
@@ -99,9 +90,7 @@ describe(_getStartAndEndCommands, function() {
       packageRoot,
       options: {
         projectName,
-        blueprint: loadSafeBlueprint({
-          name: 'ember-cli'
-        })
+        blueprint: loadSafeDefaultBlueprint(['welcome'])
       }
     });
 
@@ -131,10 +120,7 @@ describe(_getStartAndEndCommands, function() {
     let createProject = createProjectFromRemote({
       options: {
         projectName,
-        blueprint: loadSafeBlueprint({
-          name: 'ember-cli',
-          version: packageVersion
-        })
+        blueprint: loadSafeDefaultBlueprint(['welcome'], packageVersion)
       }
     });
 
@@ -298,10 +284,7 @@ describe(_getStartAndEndCommands, function() {
           packageRange: null
         },
         endOptions: {
-          blueprint: {
-            name: 'ember-cli',
-            version: endVersion
-          },
+          blueprint: defaultEndBlueprint,
           packageRange: endVersion
         }
       });
@@ -363,11 +346,10 @@ describe(_getStartAndEndCommands, function() {
       let createProject = createProjectFromRemote({
         options: {
           projectName,
-          blueprint: loadSafeBlueprint({
-            name: 'ember-cli',
-            version: packageVersion,
+          blueprint: {
+            ...loadSafeDefaultBlueprint(['welcome'], packageVersion),
             path: blueprintPath
-          })
+          }
         }
       });
 
@@ -418,12 +400,7 @@ describe(_getStartAndEndCommands, function() {
   });
 
   describe('options', function() {
-    async function processBlueprint(blueprint) {
-      let defaultBlueprint = {
-        name: 'ember-cli',
-        ...blueprint
-      };
-
+    async function processBlueprint(defaultBlueprint = loadSafeDefaultBlueprint()) {
       let options = getStartAndEndCommands({
         startBlueprint: defaultBlueprint,
         endBlueprint: defaultBlueprint
@@ -456,7 +433,7 @@ describe(_getStartAndEndCommands, function() {
     });
 
     it('can create an addon', async function() {
-      let args = await processBlueprint({ type: 'addon' });
+      let args = await processBlueprint(loadSafeDefaultBlueprint(['addon']));
 
       let i = args.indexOf('-b');
 
@@ -466,13 +443,13 @@ describe(_getStartAndEndCommands, function() {
     });
 
     it('can create an app with the --no-welcome option', async function() {
-      let args = await processBlueprint({ options: ['--no-welcome'] });
+      let args = await processBlueprint();
 
       expect(args).to.include('--no-welcome');
     });
 
     it('can create an app without the --no-welcome option', async function() {
-      let args = await processBlueprint();
+      let args = await processBlueprint(loadSafeDefaultBlueprint(['welcome']));
 
       expect(args).to.not.include('--no-welcome');
     });
@@ -484,7 +461,7 @@ describe(_getStartAndEndCommands, function() {
     });
 
     it('can create an app with the yarn option', async function() {
-      let args = await processBlueprint({ options: ['--yarn'] });
+      let args = await processBlueprint(loadSafeDefaultBlueprint(['yarn']));
 
       expect(args).to.include('--yarn');
     });
@@ -494,11 +471,7 @@ describe(_getStartAndEndCommands, function() {
     let projectName = 'my-project';
 
     it('works for default app', function() {
-      let blueprint = {
-        name: 'ember-cli',
-        type: 'app',
-        options: []
-      };
+      let blueprint = loadSafeDefaultBlueprint(['welcome']);
 
       let args = getArgs(projectName, blueprint);
 
@@ -514,11 +487,7 @@ describe(_getStartAndEndCommands, function() {
     });
 
     it('works for default addon', function() {
-      let blueprint = {
-        name: 'ember-cli',
-        type: 'addon',
-        options: []
-      };
+      let blueprint = loadSafeDefaultBlueprint(['addon']);
 
       let args = getArgs(projectName, blueprint);
 
@@ -529,16 +498,16 @@ describe(_getStartAndEndCommands, function() {
         '-sb',
         '-sg',
         '-b',
-        'addon'
+        'addon',
+        '--no-welcome'
       ]);
     });
 
     it('works for custom app', function() {
-      let blueprint = {
+      let blueprint = loadSafeBlueprint({
         name: 'my-blueprint',
-        path: '/path/to/my-blueprint',
-        options: []
-      };
+        path: '/path/to/my-blueprint'
+      });
 
       let args = getArgs(projectName, blueprint);
 
@@ -555,8 +524,7 @@ describe(_getStartAndEndCommands, function() {
 
     it('handles options', function() {
       let blueprint = {
-        name: 'ember-cli',
-        type: 'app',
+        ...loadSafeDefaultBlueprint(['welcome']),
         options: [
           '--my-option-1',
           '--my-option-2'

test/unit/save-default-blueprint-test.js

@@ -6,6 +6,7 @@ const path = require('path');
 const sinon = require('sinon');
 const utils = require('../../src/utils');
 const saveDefaultBlueprint = require('../../src/save-default-blueprint');
+const loadSafeDefaultBlueprint = require('../../src/load-safe-default-blueprint');
 
 describe(saveDefaultBlueprint, function() {
   let sandbox;
@@ -44,7 +45,7 @@ describe(saveDefaultBlueprint, function() {
 
     await saveDefaultBlueprint({
       cwd: '/test/path',
-      blueprint: { name: 'ember-cli' }
+      blueprint: loadSafeDefaultBlueprint()
     });
 
     expect(require).to.be.calledOnce;