From 25d5fe81a456709668dea8fb848a7f0ea031e8e7 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 18 Jun 2025 12:35:10 +0200 Subject: [PATCH 1/9] fix: remove inappropriate roles menu and menuitem --- decidim-core/app/helpers/decidim/menu_helper.rb | 2 +- decidim-core/app/presenters/decidim/menu_item_presenter.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/decidim-core/app/helpers/decidim/menu_helper.rb b/decidim-core/app/helpers/decidim/menu_helper.rb index c8de199cc5a95..c151a5b3e5500 100644 --- a/decidim-core/app/helpers/decidim/menu_helper.rb +++ b/decidim-core/app/helpers/decidim/menu_helper.rb @@ -57,7 +57,7 @@ def footer_menu self, element_class: "font-semibold underline", active_class: "is-active", - container_options: { class: "space-y-4 break-inside-avoid", role: :menu }, + container_options: { class: "space-y-4 break-inside-avoid" }, label: t("layouts.decidim.footer.decidim_title") ) end diff --git a/decidim-core/app/presenters/decidim/menu_item_presenter.rb b/decidim-core/app/presenters/decidim/menu_item_presenter.rb index 9354e88169528..da2454f00700a 100644 --- a/decidim-core/app/presenters/decidim/menu_item_presenter.rb +++ b/decidim-core/app/presenters/decidim/menu_item_presenter.rb @@ -29,7 +29,7 @@ def initialize(menu_item, view, options = {}) delegate :content_tag, :safe_join, :link_to, :active_link_to_class, :is_active_link?, :icon, to: :@view def render - content_tag :li, role: :menuitem, class: link_wrapper_classes do + content_tag :li, class: link_wrapper_classes do output = if url == "#" [content_tag(:span, composed_label, class: "sidebar-menu__item-disabled")] else From 97c5a2392025ce8fa4ee720417bc42f2144715b9 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 9 Jul 2025 09:44:26 +0200 Subject: [PATCH 2/9] fix: accessibility on ul menu on account page --- .../decidim/shared/_layout_user_profile.html.erb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb index b02f52413d3b0..f3941af7b2dee 100644 --- a/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb +++ b/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb @@ -29,3 +29,17 @@ <% end %> + From 552d49158596f4056938687d194449ef6e036647 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Thu, 10 Jul 2025 16:58:59 +0200 Subject: [PATCH 3/9] fix: remove unwanted code --- .../decidim/shared/_layout_user_profile.html.erb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb index f3941af7b2dee..b02f52413d3b0 100644 --- a/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb +++ b/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb @@ -29,17 +29,3 @@ <% end %> - From 2d1be5b79e50b1e17f4fd761464c762a9f223446 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Mon, 28 Jul 2025 11:09:28 +0200 Subject: [PATCH 4/9] fix: add js again to fix account page accessibility --- .../decidim/shared/_layout_user_profile.html.erb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb index b02f52413d3b0..ae502686f207d 100644 --- a/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb +++ b/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb @@ -29,3 +29,17 @@ <% end %> + From fafe912b0b1bd2fdb6b8ada32ad70b8ca06d3dde Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Mon, 1 Sep 2025 13:45:50 +0200 Subject: [PATCH 5/9] fix: remove js added for account page accessibility --- .../decidim/shared/_layout_user_profile.html.erb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb index ae502686f207d..b02f52413d3b0 100644 --- a/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb +++ b/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb @@ -29,17 +29,3 @@ <% end %> - From c0ad771c848c50dbc46ff4e3db49b2efc4821345 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Mon, 1 Sep 2025 16:06:48 +0200 Subject: [PATCH 6/9] test: try fixing election system test --- .../spec/system/admin/admin_manages_elections_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb b/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb index 30a010f0bf927..e26b96ec4f7df 100644 --- a/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb +++ b/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb @@ -21,8 +21,9 @@ let!(:unpublished_election_with_votes) { create(:election, component: current_component) } let(:attributes) { attributes_for(:election, component: current_component) } - let(:start_time) { 1.day.from_now } - let(:end_time) { 3.days.from_now } + let(:start_time) { Time.current } + let(:end_time) { Time.current.change(day: 12, hour: 12, min: 50) } + before do visit_component_admin @@ -108,6 +109,7 @@ end describe "updating an election" do + it "updates an election" do within "tr", text: translated(election.title) do find("button[data-controller='dropdown']").click From 2ed2bbc45c9ba2752112032c1c000bc4e0de7515 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Mon, 1 Sep 2025 16:23:46 +0200 Subject: [PATCH 7/9] style: update test with rubocop --- .../spec/system/admin/admin_manages_elections_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb b/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb index e26b96ec4f7df..5dafbf709e653 100644 --- a/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb +++ b/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb @@ -109,7 +109,6 @@ end describe "updating an election" do - it "updates an election" do within "tr", text: translated(election.title) do find("button[data-controller='dropdown']").click From a35b0e5ad1979710ab2a9b383dc5c3d0a9fb873d Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Tue, 2 Sep 2025 08:58:39 +0200 Subject: [PATCH 8/9] Trigger CI From cab914ff81711d0bcc419214ba8d12049a73f8d1 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Thu, 26 Mar 2026 10:42:01 +0100 Subject: [PATCH 9/9] revert: modification of elections test --- .../spec/system/admin/admin_manages_elections_spec.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb b/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb index 5dafbf709e653..30a010f0bf927 100644 --- a/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb +++ b/decidim-elections/spec/system/admin/admin_manages_elections_spec.rb @@ -21,9 +21,8 @@ let!(:unpublished_election_with_votes) { create(:election, component: current_component) } let(:attributes) { attributes_for(:election, component: current_component) } - let(:start_time) { Time.current } - let(:end_time) { Time.current.change(day: 12, hour: 12, min: 50) } - + let(:start_time) { 1.day.from_now } + let(:end_time) { 3.days.from_now } before do visit_component_admin