diff --git a/.travis.yml b/.travis.yml index e867ddea9..50f151b59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,8 @@ jobs: - env: EMBER_TRY_SCENARIO=ember-canary - env: EMBER_TRY_SCENARIO=ember-default-with-jquery - env: EMBER_TRY_SCENARIO=node-tests + - env: EMBER_TRY_SCENARIO=ember-concurrency-1.x + - env: EMBER_TRY_SCENARIO=ember-concurrency-2.x script: - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO diff --git a/config/ember-try.js b/config/ember-try.js index 3a6cf7ab2..65cf8b9ec 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -58,6 +58,22 @@ module.exports = async function() { 'jquery-integration': true }) } + }, + { + name: 'ember-concurrency-1.x', + npm: { + dependencies: { + 'ember-concurrency': '^1.3.0' + } + } + }, + { + name: 'ember-concurrency-2.x', + npm: { + dependencies: { + 'ember-concurrency': '^2.0.0-beta.1' + } + } } ] }; diff --git a/package.json b/package.json index 34cd90ea9..ec15200a1 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "ember-cli-babel": "^7.21.0", "ember-cli-htmlbars": "^5.2.0", "ember-cli-typescript": "^3.1.4", - "ember-concurrency": "^1.2.1", + "ember-concurrency": ">=1.0.0 <3", "ember-concurrency-decorators": "^2.0.0", "ember-text-measurer": "^0.6.0", "ember-truth-helpers": "^2.1.0"