nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle when the block to delete doesn't exist

Browse source 
closes #7542
This commit is contained in:
Benjamin Neff 2017-08-16 19:49:36 +02:00
parent a4d1ad160c
commit 2d06b2865f
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/blocks_controller.rb
View file

@ -12,7 +12,7 @@ class BlocksController < ApplicationController
end end
def destroy def destroy
notice = if current_user.blocks.find(params[:id]).delete notice = if current_user.blocks.find_by(id: params[:id])&.delete
{notice: t("blocks.destroy.success")} {notice: t("blocks.destroy.success")}
else else
{error: t("blocks.destroy.failure")} {error: t("blocks.destroy.failure")}
@ -20,7 +20,7 @@ class BlocksController < ApplicationController
respond_to do |format| respond_to do |format|
format.json { head :no_content } format.json { head :no_content }
format.any { redirect_back notice.merge(fallback_location: privacy_settings_path) } format.any { redirect_back fallback_location: privacy_settings_path, flash: notice }
end end
end end

7
spec/controllers/blocks_controller_spec.rb
View file

@ -33,7 +33,7 @@ describe BlocksController, :type => :controller do
it "notifies the user" do it "notifies the user" do
delete :destroy, params: {id: @block.id} delete :destroy, params: {id: @block.id}
expect(flash).not_to be_empty expect(flash[:notice]).to eq(I18n.t("blocks.destroy.success"))
end end
it "responds with 204 with json" do it "responds with 204 with json" do
@ -51,6 +51,11 @@ describe BlocksController, :type => :controller do
delete :destroy, params: {id: @block.id}, format: :json delete :destroy, params: {id: @block.id}, format: :json
}.to change { alice.blocks.count }.by(-1) }.to change { alice.blocks.count }.by(-1)
end end
it "handles when the block to delete doesn't exist" do
delete :destroy, params: {id: -1}
expect(flash[:error]).to eq(I18n.t("blocks.destroy.failure"))
end
end end
describe "#disconnect_if_contact" do describe "#disconnect_if_contact" do