From 1ff214483022eedfcffa0ca70440e95f57afe0bf Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 25 Oct 2022 15:25:57 +0200 Subject: [PATCH] Show always poll officer menu to officers Since the change on commit cbbe188d6 we added a Poll.current.any? condition to show the officing link on admin menu to officers. That condition doesn't have much sense since Poll results only can be added after a poll has ended, and there may be only one active poll. --- app/components/layout/admin_login_items_component.rb | 2 +- spec/components/layout/admin_login_items_component_spec.rb | 2 +- spec/system/officing_spec.rb | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/components/layout/admin_login_items_component.rb b/app/components/layout/admin_login_items_component.rb index 44dd2d429..2d7e85587 100644 --- a/app/components/layout/admin_login_items_component.rb +++ b/app/components/layout/admin_login_items_component.rb @@ -18,7 +18,7 @@ class Layout::AdminLoginItemsComponent < ApplicationComponent (moderation_link if user.administrator? || user.moderator?), (valuation_link if feature?(:budgets) && (user.administrator? || user.valuator?)), (management_link if user.administrator? || user.manager?), - (officing_link if user.poll_officer? && Poll.current.any?), + (officing_link if user.poll_officer?), (sdg_management_link if feature?(:sdg) && (user.administrator? || user.sdg_manager?)) ] end diff --git a/spec/components/layout/admin_login_items_component_spec.rb b/spec/components/layout/admin_login_items_component_spec.rb index def3ff068..8d1316ec1 100644 --- a/spec/components/layout/admin_login_items_component_spec.rb +++ b/spec/components/layout/admin_login_items_component_spec.rb @@ -102,7 +102,7 @@ describe Layout::AdminLoginItemsComponent do end it "shows the officing link to poll officers" do - user = create(:poll_officer, polls: [create(:poll)]).user + user = create(:poll_officer).user render_inline Layout::AdminLoginItemsComponent.new(user) diff --git a/spec/system/officing_spec.rb b/spec/system/officing_spec.rb index f3c791309..c48bafb48 100644 --- a/spec/system/officing_spec.rb +++ b/spec/system/officing_spec.rb @@ -61,7 +61,6 @@ describe "Poll Officing" do scenario "Access as an administrator is not authorized" do create(:administrator, user: user) - create(:poll) login_as(user) visit officing_root_path @@ -74,7 +73,6 @@ describe "Poll Officing" do scenario "Access as an administrator with poll officer role is authorized" do create(:administrator, user: user) create(:poll_officer, user: user) - create(:poll) login_as(user) visit root_path @@ -87,7 +85,6 @@ describe "Poll Officing" do scenario "Access as a poll officer is authorized" do create(:poll_officer, user: user) - create(:poll) login_as(user) visit root_path