diff --git a/.travis.yml b/.travis.yml index dc6fd3c4..f27bb4f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ env: - EMBER_TRY_SCENARIO=ember-2.3 - EMBER_TRY_SCENARIO=ember-2.4 - EMBER_TRY_SCENARIO=ember-2.5 + - EMBER_TRY_SCENARIO=ember-2.6 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary @@ -39,13 +40,13 @@ matrix: before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - - "npm install -g npm@^3" + - npm config set spin false + - npm install -g bower + - npm install -g npm@^3 install: - - npm install -g bower - npm install - bower install script: - - npm run-script node-test - - ember try $EMBER_TRY_SCENARIO test + - ember try $EMBER_TRY_SCENARIO test --skip-cleanup diff --git a/bower.json b/bower.json index 8f2fdf27..7e8531c7 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "ember-composable-helpers", "dependencies": { - "ember": "~2.4.1", + "ember": "~2.6.0", "ember-cli-shims": "0.1.1", "ember-cli-test-loader": "0.2.2", "ember-qunit-notifications": "0.1.0" diff --git a/config/ember-try.js b/config/ember-try.js index 40a12d09..19ea9656 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -3,96 +3,129 @@ module.exports = { scenarios: [ { name: 'default', - dependencies: { } + bower: { + dependencies: { } + } }, { name: 'ember-1.13', - dependencies: { - 'ember': '~1.13.0' - }, - resolutions: { - 'ember': '~1.13.0' + bower: { + dependencies: { + 'ember': '~1.13.0' + }, + resolutions: { + 'ember': '~1.13.0' + } } }, { name: 'ember-2.0', - dependencies: { - 'ember': '~2.0.0' - }, - resolutions: { - 'ember': '~2.0.0' + bower: { + dependencies: { + 'ember': '~2.0.0' + }, + resolutions: { + 'ember': '~2.0.0' + } } }, { name: 'ember-2.1', - dependencies: { - 'ember': '~2.1.0' - }, - resolutions: { - 'ember': '~2.1.0' + bower: { + dependencies: { + 'ember': '~2.1.0' + }, + resolutions: { + 'ember': '~2.1.0' + } } }, { name: 'ember-2.2', - dependencies: { - 'ember': '~2.2.0' - }, - resolutions: { - 'ember': '~2.2.0' + bower: { + dependencies: { + 'ember': '~2.2.0' + }, + resolutions: { + 'ember': '~2.2.0' + } } }, { name: 'ember-2.3', - dependencies: { - 'ember': '~2.3.0' - }, - resolutions: { - 'ember': '~2.3.0' + bower: { + dependencies: { + 'ember': '~2.3.0' + }, + resolutions: { + 'ember': '~2.3.0' + } } }, { name: 'ember-2.4', - dependencies: { - 'ember': '~2.4.0' - }, - resolutions: { - 'ember': '~2.4.0' + bower: { + dependencies: { + 'ember': '~2.4.0' + }, + resolutions: { + 'ember': '~2.4.0' + } } }, { name: 'ember-2.5', - dependencies: { - 'ember': '~2.5.0' - }, - resolutions: { - 'ember': '~2.5.0' + bower: { + dependencies: { + 'ember': '~2.5.0' + }, + resolutions: { + 'ember': '~2.5.0' + } + } + }, + { + name: 'ember-2.6', + bower: { + dependencies: { + 'ember': '~2.6.0' + }, + resolutions: { + 'ember': '~2.6.0' + } } }, { name: 'ember-release', - dependencies: { - 'ember': 'components/ember#release' - }, - resolutions: { - 'ember': 'release' + bower: { + dependencies: { + 'ember': 'components/ember#release' + }, + resolutions: { + 'ember': 'release' + } } }, { name: 'ember-beta', - dependencies: { - 'ember': 'components/ember#beta' - }, - resolutions: { - 'ember': 'beta' + bower: { + dependencies: { + 'ember': 'components/ember#beta' + }, + resolutions: { + 'ember': 'beta' + } } }, { name: 'ember-canary', - dependencies: { - 'ember': 'components/ember#canary' - }, - resolutions: { - 'ember': 'canary' + bower: { + dependencies: { + 'ember': 'components/ember#canary' + }, + resolutions: { + 'ember': 'canary' + } } } ] diff --git a/package.json b/package.json index 60262b55..8b0afaf2 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "build": "ember build", "start": "ember server", "node-test": "mocha test --recursive --reporter spec", - "test": "ember try:testall" + "test": "ember try:each" }, "repository": "https://github.com/DockYard/ember-composable-helpers", "bugs": "https://github.com/DockYard/ember-composable-helpers/issues", @@ -24,29 +24,29 @@ ], "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.2.0", + "broccoli-asset-rev": "^2.4.2", "chai": "^3.5.0", - "ember-ajax": "0.7.1", - "ember-cli": "2.4.2", + "ember-ajax": "^2.0.1", + "ember-cli": "2.6.0", "ember-cli-app-version": "^1.0.0", "ember-cli-dependency-checker": "^1.2.0", - "ember-cli-htmlbars": "^1.0.1", + "ember-cli-htmlbars": "^1.0.3", "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-inject-live-reload": "^1.3.1", - "ember-cli-qunit": "^1.2.1", + "ember-cli-inject-live-reload": "^1.4.0", + "ember-cli-jshint": "^1.0.0", + "ember-cli-qunit": "^1.4.0", "ember-cli-release": "0.2.8", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", "ember-disable-prototype-extensions": "^1.1.0", "ember-disable-proxy-controllers": "^1.0.1", "ember-each-in-polyfill": "0.1.3", - "ember-export-application-global": "^1.0.4", - "ember-load-initializers": "^0.5.0", + "ember-export-application-global": "^1.0.5", + "ember-load-initializers": "^0.5.1", "ember-resolver": "^2.0.3", "ember-sinon": "0.5.0", "ember-suave": "2.0.1", - "ember-try": "^0.1.2", - "loader.js": "^4.0.0", + "loader.js": "^4.0.1", "mocha": "^2.4.5" }, "keywords": [ @@ -63,7 +63,7 @@ ], "dependencies": { "broccoli-funnel": "^1.0.1", - "ember-cli-babel": "^5.1.5" + "ember-cli-babel": "^5.1.6" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js index ea1fb453..76996fd0 100644 --- a/tests/helpers/module-for-acceptance.js +++ b/tests/helpers/module-for-acceptance.js @@ -1,23 +1,23 @@ import { module } from 'qunit'; +import Ember from 'ember'; import startApp from '../helpers/start-app'; import destroyApp from '../helpers/destroy-app'; +const { RSVP: { Promise } } = Ember; + export default function(name, options = {}) { module(name, { beforeEach() { this.application = startApp(); if (options.beforeEach) { - options.beforeEach(...arguments); + return options.beforeEach.apply(this, arguments); } }, afterEach() { - destroyApp(this.application); - - if (options.afterEach) { - options.afterEach(...arguments); - } + let afterEach = options.afterEach && options.afterEach.apply(this, arguments); + return Promise.resolve(afterEach).then(() => destroyApp(this.application)); } }); }