From 79b2ee239f89e679226884f4f9598a98ae65f5b2 Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Mon, 23 Mar 2015 20:13:46 -0400 Subject: [PATCH 1/3] Added ember-try and updated .travis.yml to use it --- .travis.yml | 2 +- package.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf23938..23ec43f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ install: - bower install script: - - npm test + - ember try:testall diff --git a/package.json b/package.json index 33b2b8f..e0fc213 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,8 @@ "devDependencies": { "broccoli-asset-rev": "^2.0.0", "ember-cli": "0.2.0", - "ember-cli-babel": "^4.0.0", "ember-cli-app-version": "0.3.2", + "ember-cli-babel": "^4.0.0", "ember-cli-dependency-checker": "0.0.8", "ember-cli-htmlbars": "0.7.4", "ember-cli-ic-ajax": "0.1.1", @@ -33,7 +33,8 @@ "ember-cli-qunit": "0.3.9", "ember-cli-uglify": "1.0.1", "ember-data": "1.0.0-beta.15", - "ember-export-application-global": "^1.0.2" + "ember-export-application-global": "^1.0.2", + "ember-try": "git://github.com/kategengler/ember-try" }, "keywords": [ "ember-addon" From f6e305877ff46189fafc2dbb7c3b39e5facfff61 Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Tue, 24 Mar 2015 08:47:36 -0400 Subject: [PATCH 2/3] Removed github prefix from kategengler/ember-try --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0fc213..f07ba6d 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "ember-cli-uglify": "1.0.1", "ember-data": "1.0.0-beta.15", "ember-export-application-global": "^1.0.2", - "ember-try": "git://github.com/kategengler/ember-try" + "ember-try": "kategengler/ember-try" }, "keywords": [ "ember-addon" From 0453eeae6cb6ff9aedda03362df9cc0a15e8f3e9 Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Tue, 24 Mar 2015 08:51:18 -0400 Subject: [PATCH 3/3] Changed to 'npm run test:all' --- .travis.yml | 2 +- package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23ec43f..3755561 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ install: - bower install script: - - ember try:testall + - npm run test:all diff --git a/package.json b/package.json index f07ba6d..c6fbd1d 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "scripts": { "start": "ember server", "build": "ember build", - "test": "ember test" + "test": "ember test", + "test:all": "ember try:testall" }, "repository": { "type": "git",