From fb5fbab0110f40c305439e5a131c88539b2c5250 Mon Sep 17 00:00:00 2001 From: bmac Date: Fri, 2 Mar 2018 10:04:20 -0500 Subject: [PATCH 1/2] Fix failing test on master by adding an invalid inverse to trigger the expected error --- .../relationships/polymorphic-relationship-payloads-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/system/relationships/polymorphic-relationship-payloads-test.js b/tests/unit/system/relationships/polymorphic-relationship-payloads-test.js index b1398af49b0..333160db5c4 100644 --- a/tests/unit/system/relationships/polymorphic-relationship-payloads-test.js +++ b/tests/unit/system/relationships/polymorphic-relationship-payloads-test.js @@ -779,7 +779,7 @@ test('polymorphic hasMany to polymorphic hasMany types with separate id-spaces', testInDebug('Invalid inverses throw errors', function(assert) { let PostModel = Model.extend({ - comments: hasMany('comment', { async: false }) + comments: hasMany('comment', { async: false, inverse: 'post' }) }); let CommentModel = Model.extend({ post: belongsTo('post', { async: false, inverse: null }) From 0508db201295020d645a98e8ced83f7e83bcbda0 Mon Sep 17 00:00:00 2001 From: bmac Date: Sat, 3 Mar 2018 23:33:49 -0500 Subject: [PATCH 2/2] Fix build with ember canary --- tests/unit/adapters/json-api-adapter/ajax-test.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/unit/adapters/json-api-adapter/ajax-test.js b/tests/unit/adapters/json-api-adapter/ajax-test.js index c97fd3f1b53..94b9036a307 100644 --- a/tests/unit/adapters/json-api-adapter/ajax-test.js +++ b/tests/unit/adapters/json-api-adapter/ajax-test.js @@ -1,4 +1,3 @@ -import { computed } from '@ember/object'; import { run } from '@ember/runloop'; import setupStore from 'dummy/tests/helpers/store'; @@ -55,9 +54,7 @@ test('ajaxOptions() adds Accept header to existing headers', function(assert) { }); test('ajaxOptions() adds Accept header to existing computed properties headers', function(assert) { - adapter.headers = computed(function() { - return { 'Other-key': 'Other Value' }; - }); + adapter.headers = { 'Other-key': 'Other Value' }; let url = 'example.com'; let type = 'GET'; let ajaxOptions = adapter.ajaxOptions(url, type, {});