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.

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

Fix authorizations collection to be scped by organization #9

Merged
merged 4 commits into from
Nov 4, 2020
Merged

Fix authorizations collection to be scped by organization #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79d5fd9
Fix authorizations collection to be scped by organization
mllocs Nov 2, 2020
b754d77
Merge branch 'devel' into fix/authorizations-collection-scope-devel
mllocs Nov 4, 2020
2f05e00
Fixed test
mllocs Nov 4, 2020
b79c655
Added test to cover unscoped authorizations
mllocs Nov 4, 2020
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
7 changes: 6 additions & 1 deletion app/controllers/decidim/direct_verifications/verification/admin/authorizations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ def destroy
private

def collection
Decidim::Authorization.where(name: "direct_verifications").includes(:user)
# Decidim::Verifications::Authorizations Query
Decidim::Verifications::Authorizations.new(
organization: current_organization,
name: "direct_verifications",
granted: true
).query
end

def authorization
Expand Down
5 changes: 4 additions & 1 deletion spec/system/decidim/direct_verifications/admin/admin_manages_imported_authorizations_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
describe "Admin manages imported authorizations", type: :system do
let(:organization) { create(:organization) }
let(:user) { create(:user, :admin, :confirmed, organization: organization) }
let(:out_of_scope_user) { create(:user, :confirmed) }

let!(:authorization) { create(:authorization, :direct_verification) }
let!(:authorization) { create(:authorization, :direct_verification, user: user) }
let!(:out_of_scope_authorization) { create(:authorization, :direct_verification, user: out_of_scope_user) }
let!(:non_direct_authorization) { create(:authorization) }

let(:scope) { "decidim.direct_verifications.verification.admin" }
Expand Down Expand Up @@ -36,6 +38,7 @@
end

expect(page).not_to have_content(non_direct_authorization.name)
expect(page).not_to have_content(out_of_scope_authorization.user.name)
end

it "lets users navigate to stats and new import" do
Expand Down