Skip to content
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.

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

[BUGFIX release] Preserve local relationship changes after persisting a delet… #5068

Merged
merged 1 commit into from
Jul 18, 2017

Conversation

runspired
Copy link
Contributor

…ion when possible.

This reverts commit 16b8a04.

@stefanpenner stefanpenner self-assigned this Jul 16, 2017
@stefanpenner
Copy link
Member

I believe the test failure is related to this commit: 012372cd4 (I don't think either this PR or that commit are in in error, likely this PR needs some touch-ups, but I will review in more detail).

@runspired
Copy link
Contributor Author

I thought this too but setting the serializer to json-API for the added tests did not seem to fix at all. Could have been trolled.

@stefanpenner
Copy link
Member

stefanpenner commented Jul 18, 2017

What remains is potentially a legitimate issue. Currently investigating.

@stefanpenner
Copy link
Member

ah, i think i just implemented the fix wrong :P

…ion when possible.

This reverts commit 16b8a04.

—

The `deleteRecord() { return null; }` changes are to allow the back ported tests to work with the older JSONSerializer rather then the JSONAPISerializer which the test suite (in beta and master) use. For reference the JSONSerializer -> JSONAPISerializer landed -> emberjs#5003
env.adapter.shouldBackgroundReloadRecord = () => false;
let _super = env.serializer.normalize;
env.serializer.normalize = function(klass, payload) {
// this is required, so that the backported test actually has meaning on the release branch
Copy link
Member

Choose a reason for hiding this comment

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

this was added to make the back-ported test make sense, without having to refactor a bunch of tests

});
env.adapter.shouldBackgroundReloadRecord = () => false;
env.adapter.deleteRecord = () => {
return null;
Copy link
Member

Choose a reason for hiding this comment

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

added to ease backport ^, was { data: null }

});
env.adapter.shouldBackgroundReloadRecord = () => false;
env.adapter.deleteRecord = () => {
return null;
Copy link
Member

Choose a reason for hiding this comment

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

added to ease backport ^, was { data: null }

});
env.adapter.shouldBackgroundReloadRecord = () => false;
env.adapter.deleteRecord = () => {
return null;
Copy link
Member

Choose a reason for hiding this comment

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

added to ease backport ^, was { data: null }

});
env.adapter.shouldBackgroundReloadRecord = () => false;
env.adapter.deleteRecord = () => {
return null;
Copy link
Member

Choose a reason for hiding this comment

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

added to ease backport ^, was { data: null }

});
env.adapter.shouldBackgroundReloadRecord = () => false;
env.adapter.deleteRecord = () => {
return null;
Copy link
Member

Choose a reason for hiding this comment

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

added to ease backport ^, was { data: null }

Copy link
Member

@hjdivad hjdivad left a comment

Choose a reason for hiding this comment

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

👍 :shipit: 🚢

@stefanpenner stefanpenner merged commit 547e703 into emberjs:release Jul 18, 2017
@stefanpenner stefanpenner deleted the release branch July 18, 2017 00:52
@stefanpenner
Copy link
Member

released as v2.14.5 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants