From 6fa059be26650d24c53d25e0312ea5a190bb0103 Mon Sep 17 00:00:00 2001
From: jkuri <jkuri88@gmail.com>
Date: Fri, 18 Mar 2016 23:08:51 +0100
Subject: [PATCH] chore(): update ember-cli to 2.4.2

---
 addon/ng2/blueprints/ng2/files/package.json | 2 +-
 lib/cli/index.js                            | 2 +-
 package.json                                | 2 +-
 tests/acceptance/init.spec.js               | 8 +++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json
index 49c9d985d0..2cc289e53d 100644
--- a/addon/ng2/blueprints/ng2/files/package.json
+++ b/addon/ng2/blueprints/ng2/files/package.json
@@ -24,7 +24,7 @@
     "angular-cli": "0.0.*",
     "angular-cli-github-pages": "^0.2.0",
     "clang-format": "^1.0.35",
-    "ember-cli-inject-live-reload": "^1.3.0",
+    "ember-cli-inject-live-reload": "^1.4.0",
     "jasmine-core": "^2.3.4",
     "jasmine-spec-reporter": "^2.4.0",
     "karma": "^0.13.15",
diff --git a/lib/cli/index.js b/lib/cli/index.js
index 32c13b5c83..f619f84121 100644
--- a/lib/cli/index.js
+++ b/lib/cli/index.js
@@ -40,7 +40,7 @@ module.exports = function(options) {
   const oldStdoutWrite = process.stdout.write;
   process.stdout.write = function(line) {
     line = line.toString();
-    if (line.match(/version:|warning:/)) {
+    if (line.match(/version:|WARNING:/)) {
       return;
     }
     line = line.replace(/ember-cli(?!.com)/g, 'angular-cli')
diff --git a/package.json b/package.json
index 344cb7a8e8..6789b06b31 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "broccoli-merge-trees": "^1.1.1",
     "broccoli-writer": "^0.1.1",
     "chalk": "^1.1.1",
-    "ember-cli": "1.13.15",
+    "ember-cli": "2.4.2",
     "exit": "^0.1.2",
     "fs-extra": "^0.26.6",
     "leek": "0.0.21",
diff --git a/tests/acceptance/init.spec.js b/tests/acceptance/init.spec.js
index f05e0a7397..24aeb92e6d 100644
--- a/tests/acceptance/init.spec.js
+++ b/tests/acceptance/init.spec.js
@@ -53,7 +53,7 @@ describe('Acceptance: ng init', function() {
         });
 
         expected.forEach(function (file, index) {
-            expected[index] = file.replace(/__name__/g, 'angular-cli');
+            expected[index] = file.replace(/__name__/g, 'tmp');
         });
 
         removeIgnored(expected);
@@ -101,7 +101,7 @@ describe('Acceptance: ng init', function() {
         return ng([
             'init',
             '--skip-npm',
-            '--skip-bower',
+            '--skip-bower'
         ]).then(confirmBlueprinted);
     });
 
@@ -114,7 +114,9 @@ describe('Acceptance: ng init', function() {
                 return ng([
                     'init',
                     '--skip-npm',
-                    '--skip-bower'
+                    '--skip-bower',
+                    '--name',
+                    'tmp'
                 ]);
             })
             .then(confirmBlueprinted)