consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make action names to block and hide more clear

Browse Source 
The `hide` action was calling the `block` method while the `soft_block`
action was calling the `hide` method.

Combined with the fact that we also have a `block` permission which is
used in `ModerateActions` the logic was hard to follow.
This commit is contained in:
Javi Martín
2021-12-02 03:02:37 +01:00
parent cac24b0159
commit 021fef07b6
18 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spec/controllers/moderation/users_controller_spec.rb
View File

@@ -6,7 +6,19 @@ describe Moderation::UsersController do
describe "PUT hide" do
it "keeps query parameters while using protected redirects" do
get :hide, params: { id: user, search: "user@consul.dev", host: "evil.dev" }
user = create(:user, email: "user@consul.dev")
get :hide, params: { id: user, name_or_email: "user@consul.dev", host: "evil.dev" }
expect(response).to redirect_to "/moderation/users?name_or_email=user%40consul.dev"
end
end
describe "PUT block" do
it "keeps query parameters while using protected redirects" do
user = create(:user, email: "user@consul.dev")
get :block, params: { id: user, search: "user@consul.dev", host: "evil.dev" }
expect(response).to redirect_to "/moderation/users?search=user%40consul.dev"
end
@@ -15,7 +27,7 @@ describe Moderation::UsersController do
proposal = create(:proposal, author: user)
request.env["HTTP_REFERER"] = proposal_path(proposal)
put :hide, params: { id: user }
put :block, params: { id: user }
expect(response).to redirect_to proposals_path
expect(flash[:notice]).to eq "User blocked. All of this user's debates and comments have been hidden."
@@ -25,19 +37,9 @@ describe Moderation::UsersController do
investment = create(:budget_investment, author: user)
request.env["HTTP_REFERER"] = budget_investment_path(investment.budget, investment)
put :hide, params: { id: user }
put :block, params: { id: user }
expect(response).to redirect_to budget_investments_path(investment.budget)
end
end
describe "PUT soft_block" do
it "keeps query parameters while using protected redirects" do
user = create(:user, email: "user@consul.dev")
get :soft_block, params: { id: user, name_or_email: "user@consul.dev", host: "evil.dev" }
expect(response).to redirect_to "/moderation/users?name_or_email=user%40consul.dev"
end
end
end