Merge remote-tracking branch 'origin/beta'

ember-cli · Oct 18, 2021 · 7f4c7a3 · 7f4c7a3
2 parents 964aaaa + 2381a5c
commit 7f4c7a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/tests/acceptance/addon-smoke-test-slow.js b/tests/acceptance/addon-smoke-test-slow.js
@@ -105,6 +105,9 @@ describe('Acceptance: addon-smoke-test', function () {
     let packageJsonPath = path.join(addonRoot, 'package.json');
     let packageJson = fs.readJsonSync(packageJsonPath);
 
+    // give the addon a custom entry point
+    packageJson['ember-addon'].main = 'src/main.js';
+
     expect(packageJson.devDependencies['ember-source']).to.not.be.empty;
     expect(packageJson.devDependencies['ember-cli']).to.not.be.empty;
 
@@ -117,7 +120,7 @@ describe('Acceptance: addon-smoke-test', function () {
 
     let indexPath = path.join(addonRoot, 'dist', 'assets', 'vendor.js');
     contents = fs.readFileSync(indexPath, { encoding: 'utf8' });
-    expect(contents).to.contain('"nested-addon-main/components/simple-component"');
+    expect(contents).to.contain('"some-cool-addon/components/simple-component"');
   });
 
   it('npm pack does not include unnecessary files', async function () {

diff --git a/tests/fixtures/addon/nested-addon-main/package.json b/tests/fixtures/addon/nested-addon-main/package.json