Skip to content

Commit 259505c

Browse files
authored
Merge pull request #2569 from gilest/fix/filter-out-shim-model-class
Filter out `ShimModelClass` instances when running `discoverEmberDataModels`
2 parents 3e0739e + 5a72de0 commit 259505c

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

packages/ember-cli-mirage/addon/utils/ember-data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ export const hasEmberData =
1111
@hide
1212
*/
1313
export function isDsModel(m) {
14-
return m && typeof m.eachRelationship === 'function';
14+
return m && typeof m.eachRelationship === 'function' && m.isModel === true;
1515
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Mimics the static apis of ShimModelClass from ember-data
2+
export default class Shim {
3+
fields;
4+
attributes;
5+
relationshipsByName;
6+
7+
eachAttribute() {}
8+
eachRelationship() {}
9+
eachTransformedAttribute() {}
10+
}

0 commit comments

Comments
 (0)