Skip to content

Filter out ShimModelClass instances when running discoverEmberDataModels #2569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergeAstapov merged 2 commits into from
Feb 21, 2024
Merged

Filter out ShimModelClass instances when running discoverEmberDataModels #2569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1510c6
repro: add shim-like object to test package to fail tests
gilest Nov 29, 2023
5a72de0
fix(isDsModel): also check for `isModel`
gilest Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ember-cli-mirage/addon/utils/ember-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ export const hasEmberData =
@hide
*/
export function isDsModel(m) {
return m && typeof m.eachRelationship === 'function';
return m && typeof m.eachRelationship === 'function' && m.isModel === true;
Copy link
Copy Markdown
Contributor Author

@gilest gilest Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if isModel will be true for all classes we want to check

}
10 changes: 10 additions & 0 deletions test-packages/01-basic-app/app/models/shim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Mimics the static apis of ShimModelClass from ember-data
export default class Shim {
fields;
attributes;
relationshipsByName;

eachAttribute() {}
eachRelationship() {}
eachTransformedAttribute() {}
}
Comment on lines +1 to +10
Copy link
Copy Markdown
Contributor Author

@gilest gilest Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I add this file without the fix, this package's test suite fails
image

⚡