Merge pull request #1201 from ember-cli/getBlueprintNameOverride

upgrade getBlueprintNameOverride tests

Author: kellyselden

src/get-default-blueprint-name-override.js

@@ -26,9 +26,5 @@ module.exports = async function getBlueprintNameOverride(packageNameOrPath, cwd
     }
   }
 
-  if (packageJson['ember-addon'] && packageJson['ember-addon']['defaultBlueprint']) {
-    return packageJson['ember-addon']['defaultBlueprint'];
-  }
-
-  return null;
+  return packageJson['ember-addon']?.defaultBlueprint ?? null;
 };

test/integration/index-test.js

@@ -291,6 +291,8 @@ describe(function() {
 
     describe('ember-cli-update.json', function() {
       it('can update a remote blueprint', async function() {
+        this.timeout(1.5 * 60e3);
+
         let {
           name,
           version: to

test/unit/get-default-blueprint-name-override-test.js

@@ -4,42 +4,121 @@ const { describe, it } = require('../helpers/mocha');
 const { expect } = require('../helpers/chai');
 const getBlueprintNameOverride = require('../../src/get-default-blueprint-name-override');
 const sinon = require('sinon');
+const path = require('path');
+const fs = require('fs-extra');
 const npm = require('boilerplate-update/src/npm');
 
-const packageName = 'a-package-name';
+const cwd = 'a/made/up/path';
+const packageNameOrPath = '../a-package-name';
+const defaultBlueprint = 'not-the-same-name';
+const localPackageJsonPath = path.join(path.resolve(cwd, packageNameOrPath), 'package.json');
 
 describe(getBlueprintNameOverride, function() {
+  let pathExistsStub;
+  let readFileStub;
+  let jsonStub;
+
+  beforeEach(function() {
+    pathExistsStub = sinon.stub(fs, 'pathExists');
+    readFileStub = sinon.stub(fs, 'readFile');
+    jsonStub = sinon.stub(npm, 'json');
+  });
+
   afterEach(function() {
     sinon.restore();
   });
 
   it('returns default blueprint override name if it exists', async function() {
-    sinon.stub(npm, 'json').resolves({
-      name: packageName,
+    pathExistsStub.withArgs(localPackageJsonPath).resolves(true);
+
+    readFileStub.withArgs(localPackageJsonPath).resolves(JSON.stringify({
+      name: packageNameOrPath,
       'ember-addon': {
-        defaultBlueprint: 'not-the-same-name'
+        defaultBlueprint
+      }
+    }));
+
+    let defaultBlueprintOverride = await getBlueprintNameOverride(packageNameOrPath, cwd);
+
+    expect(defaultBlueprintOverride).to.equal(defaultBlueprint);
+  });
+
+  it('doesn\'t use npm if found locally', async function() {
+    pathExistsStub.withArgs(localPackageJsonPath).resolves(true);
+
+    readFileStub.withArgs(localPackageJsonPath).resolves(JSON.stringify({
+      name: packageNameOrPath,
+      'ember-addon': {
+        defaultBlueprint
+      }
+    }));
+
+    await getBlueprintNameOverride(packageNameOrPath, cwd);
+
+    expect(jsonStub).to.not.have.been.called;
+  });
+
+  it('uses npm if not found locally', async function() {
+    pathExistsStub.withArgs(localPackageJsonPath).resolves(false);
+
+    jsonStub.withArgs('view', packageNameOrPath).resolves({
+      name: packageNameOrPath,
+      'ember-addon': {
+        defaultBlueprint
       }
     });
 
-    let defaultBlueprintOverride = await getBlueprintNameOverride(packageName);
+    let defaultBlueprintOverride = await getBlueprintNameOverride(packageNameOrPath, cwd);
 
-    expect(defaultBlueprintOverride).to.equal('not-the-same-name');
+    expect(defaultBlueprintOverride).to.equal(defaultBlueprint);
   });
 
-  it('Null if property does not exist in package.json', async function() {
-    sinon.stub(npm, 'json').resolves({
-      name: packageName
+  it('doesn\'t read local file if using npm', async function() {
+    pathExistsStub.withArgs(localPackageJsonPath).resolves(false);
+
+    jsonStub.withArgs('view', packageNameOrPath).resolves({
+      name: packageNameOrPath,
+      'ember-addon': {
+        defaultBlueprint
+      }
     });
 
-    let defaultBlueprintOverride = await getBlueprintNameOverride(packageName);
+    await getBlueprintNameOverride(packageNameOrPath, cwd);
+
+    expect(readFileStub).to.not.have.been.called;
+  });
+
+  it('Null if ember-addon does not exist in package.json', async function() {
+    pathExistsStub.withArgs(localPackageJsonPath).resolves(true);
+
+    readFileStub.withArgs(localPackageJsonPath).resolves(JSON.stringify({
+      name: packageNameOrPath
+    }));
+
+    let defaultBlueprintOverride = await getBlueprintNameOverride(packageNameOrPath, cwd);
+
+    expect(defaultBlueprintOverride).to.be.null;
+  });
+
+  it('Null if defaultBlueprint does not exist in ember-addon', async function() {
+    pathExistsStub.withArgs(localPackageJsonPath).resolves(true);
+
+    readFileStub.withArgs(localPackageJsonPath).resolves(JSON.stringify({
+      name: packageNameOrPath,
+      'ember-addon': {}
+    }));
+
+    let defaultBlueprintOverride = await getBlueprintNameOverride(packageNameOrPath, cwd);
 
     expect(defaultBlueprintOverride).to.be.null;
   });
 
   it('Error in spawn returns null', async function() {
-    sinon.stub(npm, 'json').rejects();
+    pathExistsStub.withArgs(localPackageJsonPath).resolves(false);
+
+    jsonStub.withArgs('view', packageNameOrPath).rejects();
 
-    let defaultBlueprintOverride = await getBlueprintNameOverride(packageName);
+    let defaultBlueprintOverride = await getBlueprintNameOverride(packageNameOrPath, cwd);
 
     expect(defaultBlueprintOverride).to.be.null;
   });