Skip to content

Commit

Permalink
Merge pull request #4718 from canufeel/fix/inverse-null-relationships
Browse files Browse the repository at this point in the history
[BUGFIX beta] Inverse null relationships should throw if model doesn't exist 3
  • Loading branch information
bmac authored Dec 15, 2016
2 parents c2af5be + b53e26d commit 7f4c840
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
5 changes: 5 additions & 0 deletions addon/-private/system/relationships/state/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Ember from 'ember';
import ManyRelationship from "ember-data/-private/system/relationships/state/has-many";
import BelongsToRelationship from "ember-data/-private/system/relationships/state/belongs-to";
import EmptyObject from "ember-data/-private/system/empty-object";
import { runInDebug } from 'ember-data/-private/debug';

const { get } = Ember;

Expand All @@ -16,6 +17,10 @@ function createRelationshipFor(internalModel, relationshipMeta, store) {

if (shouldFindInverse(relationshipMeta)) {
inverse = internalModel.type.inverseFor(relationshipMeta.key, store);
} else {
runInDebug(() => {
internalModel.type.typeForRelationship(relationshipMeta.key, store);
});
}

if (inverse) {
Expand Down
14 changes: 14 additions & 0 deletions tests/integration/relationships/inverse-relationships-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -599,3 +599,17 @@ test("inverseFor is only called when inverse is not null", function(assert) {
});
});
});

testInDebug("Inverse null relationships with models that don't exist throw a nice error", function(assert) {
User = DS.Model.extend({
post: DS.belongsTo('post', { inverse: null })
});

var env = setupStore({ user: User });

assert.throws(function() {
run(function() {
env.store.createRecord('user');
});
}, /No model was found for 'post'/);
});
3 changes: 2 additions & 1 deletion tests/unit/debug-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ test("_debugInfo supports arbitray relationship types", function(assert) {
options: { inverse: null },
isRelationship: true,
kind: 'customRelationship',
name: 'Custom Relationship'
name: 'Custom Relationship',
type: 'post'
})
});

Expand Down

0 comments on commit 7f4c840

Please sign in to comment.