Repository: ember-cli/ember-cli
Pull request #7200 (2017-07-06 02:25:43)

verify welcome page logic


Patch:
diff --git a/blueprints/app/files/app/templates/application.hbs b/blueprints/app/files/app/templates/application.hbs
index 8a64bd03d..347236121 100644
--- a/blueprints/app/files/app/templates/application.hbs
+++ b/blueprints/app/files/app/templates/application.hbs
@@ -3,4 +3,4 @@
 {{!-- Feel free to remove this! --}}
 <% } else { %><h2 id="title">Welcome to Ember</h2>
 <% } %>
-{{outlet}}
+{{outlet}}
\ No newline at end of file


Test patch:
diff --git a/tests/acceptance/new-test.js b/tests/acceptance/new-test.js
index 3140f4249..013727079 100644
--- a/tests/acceptance/new-test.js
+++ b/tests/acceptance/new-test.js
@@ -365,16 +365,18 @@ describe('Acceptance: ember new', function() {
   }));
 
   describe('verify fictures', function() {
-    it('app + npm', co.wrap(function *() {
+    it('app + npm + !welcome', co.wrap(function *() {
       yield ember([
         'new',
         'foo',
         '--skip-npm',
         '--skip-bower',
         '--skip-git',
+        '--no-welcome',
       ]);
 
       [
+        'app/templates/application.hbs',
         '.travis.yml',
       ].forEach(filePath => {
         expect(file(filePath))
@@ -382,7 +384,7 @@ describe('Acceptance: ember new', function() {
       });
     }));
 
-    it('app + yarn', co.wrap(function *() {
+    it('app + yarn + welcome', co.wrap(function *() {
       yield ember([
         'new',
         'foo',
@@ -393,6 +395,7 @@ describe('Acceptance: ember new', function() {
       ]);
 
       [
+        'app/templates/application.hbs',
         '.travis.yml',
       ].forEach(filePath => {
         expect(file(filePath))
@@ -400,7 +403,7 @@ describe('Acceptance: ember new', function() {
       });
     }));
 
-    it('addon + npm', co.wrap(function *() {
+    it('addon + npm + !welcome', co.wrap(function *() {
       yield ember([
         'addon',
         'foo',
@@ -410,6 +413,7 @@ describe('Acceptance: ember new', function() {
       ]);
 
       [
+        'tests/dummy/app/templates/application.hbs',
         '.travis.yml',
       ].forEach(filePath => {
         expect(file(filePath))
@@ -417,7 +421,7 @@ describe('Acceptance: ember new', function() {
       });
     }));
 
-    it('addon + yarn', co.wrap(function *() {
+    it('addon + yarn + welcome', co.wrap(function *() {
       yield ember([
         'addon',
         'foo',
@@ -425,9 +429,11 @@ describe('Acceptance: ember new', function() {
         '--skip-bower',
         '--skip-git',
         '--yarn',
+        '--welcome',
       ]);
 
       [
+        'tests/dummy/app/templates/application.hbs',
         '.travis.yml',
       ].forEach(filePath => {
         expect(file(filePath))
diff --git a/tests/fixtures/addon/npm/tests/dummy/app/templates/application.hbs b/tests/fixtures/addon/npm/tests/dummy/app/templates/application.hbs
new file mode 100644
index 000000000..5230580f8
--- /dev/null
+++ b/tests/fixtures/addon/npm/tests/dummy/app/templates/application.hbs
@@ -0,0 +1,3 @@
+<h2 id="title">Welcome to Ember</h2>
+
+{{outlet}}
\ No newline at end of file
diff --git a/tests/fixtures/addon/yarn/tests/dummy/app/templates/application.hbs b/tests/fixtures/addon/yarn/tests/dummy/app/templates/application.hbs
new file mode 100644
index 000000000..1eac0a203
--- /dev/null
+++ b/tests/fixtures/addon/yarn/tests/dummy/app/templates/application.hbs
@@ -0,0 +1,5 @@
+{{!-- The following component displays Ember's default welcome message. --}}
+{{welcome-page}}
+{{!-- Feel free to remove this! --}}
+
+{{outlet}}
\ No newline at end of file
diff --git a/tests/fixtures/app/npm/app/templates/application.hbs b/tests/fixtures/app/npm/app/templates/application.hbs
new file mode 100644
index 000000000..5230580f8
--- /dev/null
+++ b/tests/fixtures/app/npm/app/templates/application.hbs
@@ -0,0 +1,3 @@
+<h2 id="title">Welcome to Ember</h2>
+
+{{outlet}}
\ No newline at end of file
diff --git a/tests/fixtures/app/yarn/app/templates/application.hbs b/tests/fixtures/app/yarn/app/templates/application.hbs
new file mode 100644
index 000000000..1eac0a203
--- /dev/null
+++ b/tests/fixtures/app/yarn/app/templates/application.hbs
@@ -0,0 +1,5 @@
+{{!-- The following component displays Ember's default welcome message. --}}
+{{welcome-page}}
+{{!-- Feel free to remove this! --}}
+
+{{outlet}}
\ No newline at end of file