Skip to content

Revert "Use destroy instead of delete to ensure callbacks are called - master #1267

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
lgebhardt merged 2 commits into from
Jul 9, 2019
Merged

Revert "Use destroy instead of delete to ensure callbacks are called - master #1267

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
7445e89
Test remove relationship does not remove related resource
lgebhardt Jul 9, 2019
436f062
Revert "Use `destroy` instead of `delete` to ensure callbacks are cal…
lgebhardt Jul 9, 2019
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 lib/jsonapi/basic_resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ def _remove_to_many_link(relationship_type, key, options)

@reload_needed = true
else
@model.public_send(relationship.relation_name(context: @context)).destroy(key)
@model.public_send(relationship.relation_name(context: @context)).delete(key)
end

:completed
Expand Down
19 changes: 19 additions & 0 deletions test/controllers/controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,6 +1396,25 @@ def test_update_relationship_to_one_singular_param
assert_equal ruby.id, post_object.section_id
end

def test_remove_relationship_to_many_belongs_to
set_content_type_header!
c = Comment.find(3)
p = Post.find(2)
total_comment_count = Comment.count
post_comment_count = p.comments.count

put :destroy_relationship, params: {post_id: "#{p.id}", relationship: 'comments', data: [{type: 'comments', id: "#{c.id}"}]}

assert_response :no_content
p = Post.find(2)
c = Comment.find(3)

assert_equal post_comment_count - 1, p.comments.length
assert_equal total_comment_count, Comment.count

assert_nil c.post_id
end

def test_update_relationship_to_many_join_table_single
set_content_type_header!
put :update_relationship, params: {post_id: 3, relationship: 'tags', data: []}
Expand Down