Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion app/controllers/addresses_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ def set_person
@person = Person.find(params[:person_id])
end

# A person has at most one address, and may have none yet: show, update and
# destroy on a person without one are a 404, not a nil blowing up in the
# action.
def set_address
@address = @person.address
@address = @person.address || raise(ActiveRecord::RecordNotFound.new("Person #{@person.id} has no address", "Address"))
end

def address_params
Expand Down
24 changes: 24 additions & 0 deletions test/controllers/addresses_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,28 @@ class AddressesControllerTest < ActionDispatch::IntegrationTest
end
assert_redirected_to person_url(@person)
end

test "show is a 404 for a person without an address" do
@person.address.destroy

get person_address_url(@person)
assert_response :not_found
end

test "update is a 404 for a person without an address" do
@person.address.destroy

patch person_address_url(@person), params: { address: { city: "Springfield" } }
assert_response :not_found
assert_equal 0, Address.where(person_id: @person.id).count
end

test "destroy is a 404 for a person without an address" do
@person.address.destroy

assert_no_difference("Address.count") do
delete person_address_url(@person)
end
assert_response :not_found
end
end