From eab98a29284bf29c30373b98e51e71d208d44c46 Mon Sep 17 00:00:00 2001 From: sandstrom Date: Mon, 6 Nov 2017 17:18:11 +0100 Subject: [PATCH 1/2] Update links to Ember Guide --- addon/-private/system/model/model.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addon/-private/system/model/model.js b/addon/-private/system/model/model.js index c44dbfeccb9..521d7425088 100644 --- a/addon/-private/system/model/model.js +++ b/addon/-private/system/model/model.js @@ -1321,7 +1321,7 @@ Model.reopenClass({ } else { //No inverse was specified manually, we need to use a heuristic to guess one if (propertyMeta.parentType && propertyMeta.type === propertyMeta.parentType.modelName) { - warn(`Detected a reflexive relationship by the name of '${name}' without an inverse option. Look at https://emberjs.com/guides/models/defining-models/#toc_reflexive-relation for how to explicitly specify inverses.`, false, { + warn(`Detected a reflexive relationship by the name of '${name}' without an inverse option. Look at https://guides.emberjs.com/current/models/relationships/#toc_reflexive-relations for how to explicitly specify inverses.`, false, { id: 'ds.model.reflexive-relationship-without-inverse' }); } @@ -1336,7 +1336,7 @@ Model.reopenClass({ }); assert("You defined the '" + name + "' relationship on " + this + ", but you defined the inverse relationships of type " + - inverseType.toString() + " multiple times. Look at https://emberjs.com/guides/models/defining-models/#toc_explicit-inverses for how to explicitly specify inverses", + inverseType.toString() + " multiple times. Look at https://guides.emberjs.com/current/models/relationships/#toc_explicit-inverses for how to explicitly specify inverses", filteredRelationships.length < 2); if (filteredRelationships.length === 1 ) { @@ -1344,7 +1344,7 @@ Model.reopenClass({ } assert("You defined the '" + name + "' relationship on " + this + ", but multiple possible inverse relationships of type " + - this + " were found on " + inverseType + ". Look at https://emberjs.com/guides/models/defining-models/#toc_explicit-inverses for how to explicitly specify inverses", + this + " were found on " + inverseType + ". Look at https://guides.emberjs.com/current/models/relationships/#toc_explicit-inverses for how to explicitly specify inverses", possibleRelationships.length === 1); inverseName = possibleRelationships[0].name; From 8da0f4fa67d576f19441bada2f36310d463d1302 Mon Sep 17 00:00:00 2001 From: sandstrom Date: Mon, 6 Nov 2017 17:33:04 +0100 Subject: [PATCH 2/2] Update inverse-test.js --- tests/integration/inverse-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/inverse-test.js b/tests/integration/inverse-test.js index d2881b9dd23..2656594cee7 100644 --- a/tests/integration/inverse-test.js +++ b/tests/integration/inverse-test.js @@ -109,7 +109,7 @@ testInDebug("Errors out if you define 2 inverses to the same model", function(as assert.expectAssertion(() => { User.inverseFor('job', store); - }, "You defined the 'job' relationship on user, but you defined the inverse relationships of type job multiple times. Look at https://emberjs.com/guides/models/defining-models/#toc_explicit-inverses for how to explicitly specify inverses"); + }, /^You defined the 'job' relationship on user, but you defined the inverse relationships of type job multiple times/i); });