From 9d0214374b4addabb63ce31f59000c9e76d969cd Mon Sep 17 00:00:00 2001 From: cyrillefr Date: Thu, 20 Mar 2025 13:46:35 +0100 Subject: [PATCH 1/2] Replace link with button in ballot investment component --- app/assets/stylesheets/budgets/ballot/investment.scss | 1 + .../budgets/ballot/investment_component.html.erb | 2 +- spec/system/budgets/ballots_spec.rb | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/budgets/ballot/investment.scss b/app/assets/stylesheets/budgets/ballot/investment.scss index 8333d1aa7..005a4d85a 100644 --- a/app/assets/stylesheets/budgets/ballot/investment.scss +++ b/app/assets/stylesheets/budgets/ballot/investment.scss @@ -33,6 +33,7 @@ position: absolute; right: $close-icon-margin; top: $close-icon-margin; + cursor: pointer; } &:hover { diff --git a/app/components/budgets/ballot/investment_component.html.erb b/app/components/budgets/ballot/investment_component.html.erb index 58e62f4ea..83e439d5e 100644 --- a/app/components/budgets/ballot/investment_component.html.erb +++ b/app/components/budgets/ballot/investment_component.html.erb @@ -3,7 +3,7 @@ <%= investment_price %> <% if budget.balloting? %> - <%= link_to delete_path, + <%= button_to delete_path, title: t("budgets.ballots.show.remove"), class: "remove-budget-investment", method: :delete, diff --git a/spec/system/budgets/ballots_spec.rb b/spec/system/budgets/ballots_spec.rb index 36bf600d0..2be0cdd0f 100644 --- a/spec/system/budgets/ballots_spec.rb +++ b/spec/system/budgets/ballots_spec.rb @@ -379,7 +379,7 @@ describe "Ballots" do expect(page).to have_content("You have voted one investment") within("#budget_investment_#{investment.id}") do - click_link "Remove vote" + click_button "Remove vote" end expect(page).to have_current_path(budget_ballot_path(budget)) @@ -406,7 +406,7 @@ describe "Ballots" do end within("#sidebar #budget_investment_#{investment1.id}_sidebar") do - click_link "Remove vote" + click_button "Remove vote" end expect(page).to have_css("#total_amount", text: "€20,000") @@ -436,7 +436,7 @@ describe "Ballots" do expect(page).to have_content("You have voted one investment") within(".ballot-list li", text: "Sully monument") do - click_link "Remove vote" + click_button "Remove vote" end expect(page).to have_content("You have voted 0 investments") @@ -623,7 +623,7 @@ describe "Ballots" do end within("#budget_investment_#{bi1.id}_sidebar") do - click_link "Remove vote" + click_button "Remove vote" end expect(page).not_to have_css "#budget_investment_#{bi1.id}_sidebar" From 03c6d9156f017e78c5e9df9101718986eddc2427 Mon Sep 17 00:00:00 2001 From: cyrillefr Date: Thu, 20 Mar 2025 14:44:52 +0100 Subject: [PATCH 2/2] Fix lint/style offenses --- app/assets/stylesheets/budgets/ballot/investment.scss | 2 +- .../budgets/ballot/investment_component.html.erb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/budgets/ballot/investment.scss b/app/assets/stylesheets/budgets/ballot/investment.scss index 005a4d85a..638a10475 100644 --- a/app/assets/stylesheets/budgets/ballot/investment.scss +++ b/app/assets/stylesheets/budgets/ballot/investment.scss @@ -29,11 +29,11 @@ .remove-budget-investment { @include has-fa-icon(times, solid); + cursor: pointer; font-size: $close-icon-size; position: absolute; right: $close-icon-margin; top: $close-icon-margin; - cursor: pointer; } &:hover { diff --git a/app/components/budgets/ballot/investment_component.html.erb b/app/components/budgets/ballot/investment_component.html.erb index 83e439d5e..42aa8c9f2 100644 --- a/app/components/budgets/ballot/investment_component.html.erb +++ b/app/components/budgets/ballot/investment_component.html.erb @@ -4,10 +4,10 @@ <% if budget.balloting? %> <%= button_to delete_path, - title: t("budgets.ballots.show.remove"), - class: "remove-budget-investment", - method: :delete, - remote: true do %> + title: t("budgets.ballots.show.remove"), + class: "remove-budget-investment", + method: :delete, + remote: true do %> <%= t("budgets.ballots.show.remove") %> <% end %> <% end %>