From e0210edf34f95d1405c268e20cd5bf64a0ab772e Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Sat, 4 Apr 2015 21:21:40 -0400 Subject: [PATCH 1/2] Add ember-try to enable testing many Ember versions. --- config/ember-try.js | 43 +++++++++++++++++++++++++++++++++++++++++++ package.json | 4 ++-- 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 config/ember-try.js diff --git a/config/ember-try.js b/config/ember-try.js new file mode 100644 index 000000000..64717ed03 --- /dev/null +++ b/config/ember-try.js @@ -0,0 +1,43 @@ +module.exports = { + scenarios: [ + { + name: 'ember-1.10.0', + dependencies: { + "ember": "1.10.0" + } + }, + { + name: 'ember-1.11.1', + dependencies: { + "ember": "1.11.1" + } + }, + { + name: 'ember-release', + dependencies: { + "ember": "components/ember#release" + }, + resolutions: { + "ember": "release" + } + }, + { + name: 'ember-beta', + dependencies: { + "ember": "components/ember#beta" + }, + resolutions: { + "ember": "beta" + } + }, + { + name: 'ember-canary', + dependencies: { + "ember": "components/ember#canary" + }, + resolutions: { + "ember": "canary" + } + } + ] +}; diff --git a/package.json b/package.json index 60fa6f33b..03773434d 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,7 @@ }, "scripts": { "start": "ember serve", - "pretest": "ember build", - "test": "testem ci" + "test": "ember test" }, "authors": [ "Dan Gebhardt", @@ -28,6 +27,7 @@ "broccoli-sourcemap-concat": "^0.4.3", "broccoli-static-compiler": "^0.1.4", "ember-cli": "^0.1.12", + "ember-try": "0.0.3", "testem": "^0.6.19" } } From a7459f52fd5415bd44d8f6d8592f3ee8f3249b06 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Sat, 4 Apr 2015 21:22:55 -0400 Subject: [PATCH 2/2] Test all Ember versions in Travis. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3d089bc11..4349b2952 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ install: - bower install script: - - npm test + - ./node_modules/.bin/ember try:testall