diff --git a/.travis.yml b/.travis.yml index 128ba30..2914674 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ env: - EMBER_TRY_SCENARIO=ember-2.4.6-LTS - EMBER_TRY_SCENARIO=ember-2.5.1 - EMBER_TRY_SCENARIO=ember-2.6.2 + - EMBER_TRY_SCENARIO=ember-2.7.3 matrix: fast_finish: true @@ -34,7 +35,7 @@ before_install: - npm install -g bower - bower --version - npm install phantomjs-prebuilt - - phantomjs --version + - node_modules/phantomjs-prebuilt/bin/phantomjs --version install: - npm install diff --git a/bower.json b/bower.json index c78ddba..eb82a05 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,8 @@ { "name": "ember-jsonapi-resources", "dependencies": { - "ember": "~2.7.0", + "ember": "~2.8.0", "ember-cli-shims": "0.1.1", - "ember-qunit-notifications": "0.1.0", "fetch": "~0.10.1", "es6-promise": "~3.0.2" }, diff --git a/config/ember-try.js b/config/ember-try.js index 041b102..03170dd 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -121,6 +121,17 @@ module.exports = { 'ember': '2.6.2' } } + }, + { + name: 'ember-2.7.3', + bower: { + dependencies: { + 'ember': '2.7.3' + }, + resolutions: { + 'ember': '2.7.3' + } + } } ] }; diff --git a/package.json b/package.json index b78cc7f..788bf47 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "broccoli-static-compiler": "^0.2.1", "ember-ajax": "^2.0.1", "ember-buffered-proxy": "^0.5.1", - "ember-cli": "2.7.0", + "ember-cli": "2.8.0", "ember-cli-app-version": "^1.0.0", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.2.0", @@ -34,7 +34,7 @@ "ember-cli-inject-live-reload": "^1.4.0", "ember-cli-jshint": "^1.0.0", "ember-cli-path-utils": "^1.0.0", - "ember-cli-qunit": "^2.0.0", + "ember-cli-qunit": "^2.1.0", "ember-cli-release": "^0.2.9", "ember-cli-sri": "^2.1.0", "ember-cli-string-utils": "^1.0.0", diff --git a/tests/unit/adapters/application-test.js b/tests/unit/adapters/application-test.js index 1ac2ec3..7367218 100644 --- a/tests/unit/adapters/application-test.js +++ b/tests/unit/adapters/application-test.js @@ -25,7 +25,7 @@ moduleFor('adapter:application', 'Unit | Adapter | application', { window.localStorage.removeItem('AuthorizationHeader'); }, afterEach() { - teardown(); + teardown.call(this); sandbox.restore(); window.localStorage.removeItem('AuthorizationHeader'); } diff --git a/tests/unit/models/resource-test.js b/tests/unit/models/resource-test.js index e4666da..f904ef5 100644 --- a/tests/unit/models/resource-test.js +++ b/tests/unit/models/resource-test.js @@ -20,7 +20,7 @@ moduleFor('model:resource', 'Unit | Model | resource', { }; }, afterEach() { - teardown(); + teardown.call(this); this.sandbox.restore(); this.registry.unregister('model:resource'); this.subject = this._ogSubject; diff --git a/tests/unit/serializers/application-test.js b/tests/unit/serializers/application-test.js index 584cbb9..d87ab44 100644 --- a/tests/unit/serializers/application-test.js +++ b/tests/unit/serializers/application-test.js @@ -12,7 +12,7 @@ moduleFor('serializer:application', 'Unit | Serializer | application', { sandbox = window.sinon.sandbox.create(); }, afterEach() { - teardown(); + teardown.call(this); sandbox.restore(); } }); diff --git a/tests/unit/utils/has-many-test.js b/tests/unit/utils/has-many-test.js index 0556b26..f65851f 100644 --- a/tests/unit/utils/has-many-test.js +++ b/tests/unit/utils/has-many-test.js @@ -26,7 +26,7 @@ moduleFor('model:resource', 'Unit | Utility | hasMany', { }, afterEach() { mockServices = null; - teardown(); + teardown.call(this); this.sandbox.restore(); } }); diff --git a/tests/unit/utils/has-one-test.js b/tests/unit/utils/has-one-test.js index f6d1d1f..4e51602 100644 --- a/tests/unit/utils/has-one-test.js +++ b/tests/unit/utils/has-one-test.js @@ -27,7 +27,7 @@ moduleFor('model:resource', 'Unit | Utility | hasOne', { }, afterEach() { mockServices = null; - teardown(); + teardown.call(this); this.sandbox.restore(); } });