Merge pull request #10051 from bertdeblock/move-ember-try-config-file

[ENHANCEMENT] Move `ember-try.js` config file to `tests/dummy/config/ember-try.js` for addons
ember-cli · Oct 20, 2022 · 018a541 · 018a541
2 parents 4ec71e1 + d6ae130
commit 018a541
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 4 deletions.
diff --git a/blueprints/addon/files/npmignore b/blueprints/addon/files/npmignore
@@ -22,7 +22,6 @@
 /.travis.yml
 /.watchmanconfig
 /bower.json
-/config/ember-try.js
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js

diff --git a/blueprints/addon/index.js b/blueprints/addon/index.js
@@ -189,7 +189,7 @@ module.exports = {
     '^config.*': 'tests/dummy/:path',
     '^public.*': 'tests/dummy/:path',
 
-    '^addon-config/ember-try.js': 'config/ember-try.js',
+    '^addon-config/ember-try.js': 'tests/dummy/config/ember-try.js',
 
     '^npmignore': '.npmignore',
   },

diff --git a/tests/acceptance/new-test.js b/tests/acceptance/new-test.js
@@ -510,7 +510,7 @@ describe('Acceptance: ember new', function () {
       let fixturePath = `${namespace}/defaults`;
 
       [
-        'config/ember-try.js',
+        'tests/dummy/config/ember-try.js',
         'tests/dummy/app/templates/application.hbs',
         '.github/workflows/ci.yml',
         'README.md',
@@ -579,7 +579,7 @@ describe('Acceptance: ember new', function () {
       let fixturePath = 'addon/yarn';
 
       [
-        'config/ember-try.js',
+        'tests/dummy/config/ember-try.js',
         'tests/dummy/app/templates/application.hbs',
         '.github/workflows/ci.yml',
         'README.md',

diff --git a/...addon/defaults-travis/config/ember-try.js → ...ts-travis/tests/dummy/config/ember-try.js b/...addon/defaults-travis/config/ember-try.js → ...ts-travis/tests/dummy/config/ember-try.js
diff --git a/...xtures/addon/defaults/config/ember-try.js → .../defaults/tests/dummy/config/ember-try.js b/...xtures/addon/defaults/config/ember-try.js → .../defaults/tests/dummy/config/ember-try.js
diff --git a/...s/fixtures/addon/yarn/config/ember-try.js → ...ddon/yarn/tests/dummy/config/ember-try.js b/...s/fixtures/addon/yarn/config/ember-try.js → ...ddon/yarn/tests/dummy/config/ember-try.js