From 10eae9e8d5454d8e82c73b553b830cfb1749fd96 Mon Sep 17 00:00:00 2001
From: Mike Brocchi <mbrocchi@gmail.com>
Date: Fri, 27 Nov 2015 15:32:21 -0500
Subject: [PATCH] chore: updated the ember-cli version to the latest release

Change the reference to ember-cli from a github reference to an npm ref via fixed version
Add errorStream configuration in mock-ui test helper

fixes #73
---
 package.json             | 6 +++---
 tests/helpers/mock-ui.js | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 61d2b63a203e..4041847160f2 100644
--- a/package.json
+++ b/package.json
@@ -31,11 +31,11 @@
   "dependencies": {
     "broccoli": "^0.16.3",
     "broccoli-concat": "0.0.13",
-    "broccoli-funnel": "^0.2.3",
-    "broccoli-merge-trees": "^0.2.1",
+    "broccoli-funnel": "^1.0.0",
+    "broccoli-merge-trees": "^1.0.0",
     "broccoli-writer": "^0.1.1",
     "chalk": "^1.1.0",
-    "ember-cli": "ember-cli/ember-cli#ae5e72614e40f5e6dd57463e526c65da899fde07",
+    "ember-cli": "1.13.13",
     "exit": "^0.1.2",
     "fs-extra": "^0.18.4",
     "leek": "0.0.19",
diff --git a/tests/helpers/mock-ui.js b/tests/helpers/mock-ui.js
index e586d4ccd9fa..ca55f3c38036 100644
--- a/tests/helpers/mock-ui.js
+++ b/tests/helpers/mock-ui.js
@@ -12,6 +12,9 @@ function MockUI() {
         inputStream: through(),
         outputStream: through(function(data) {
             this.output += data;
+        }.bind(this)),
+        errorStream: through(function(data) {
+          this.errors += data;
         }.bind(this))
     });
 }