From b34cfaac1bbb9384667ee06e6101f37e3cbb7c83 Mon Sep 17 00:00:00 2001 From: Alberto Date: Thu, 10 Aug 2023 18:32:54 +0200 Subject: [PATCH 1/3] Replace back link on budget results --- app/views/budgets/results/show.html.erb | 2 +- spec/system/budgets/results_spec.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/budgets/results/show.html.erb b/app/views/budgets/results/show.html.erb index 605309c1b..9646802d2 100644 --- a/app/views/budgets/results/show.html.erb +++ b/app/views/budgets/results/show.html.erb @@ -14,7 +14,7 @@
- <%= back_link_to budgets_path %> + <%= back_link_to budget_path(@budget) %>

<%= t("budgets.results.heading") %>
<%= @budget.name %> diff --git a/spec/system/budgets/results_spec.rb b/spec/system/budgets/results_spec.rb index b17618ef6..a3c7516aa 100644 --- a/spec/system/budgets/results_spec.rb +++ b/spec/system/budgets/results_spec.rb @@ -14,6 +14,12 @@ describe "Results" do Budget::Result.new(budget, heading).calculate_winners end + scenario "Back link redirects to budget page" do + visit budget_results_path(budget) + + expect(page).to have_link("Go back", href: budget_path(budget)) + end + scenario "No links to budget results with results disabled" do budget.update!(results_enabled: false) From ea38b6d6c536b35ce5e798d21ad2ef1287e443ac Mon Sep 17 00:00:00 2001 From: Alberto Date: Fri, 3 Nov 2023 10:57:07 +0100 Subject: [PATCH 2/3] Replace back link on budget stats --- app/views/budgets/stats/show.html.erb | 2 +- spec/system/budgets/stats_spec.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb index 5ad9e09ba..81cf877d4 100644 --- a/app/views/budgets/stats/show.html.erb +++ b/app/views/budgets/stats/show.html.erb @@ -12,7 +12,7 @@
- <%= back_link_to budgets_path %> + <%= back_link_to budget_path(@budget) %>

<%= t("stats.title") %>
<%= @budget.name %> diff --git a/spec/system/budgets/stats_spec.rb b/spec/system/budgets/stats_spec.rb index 3e1693765..b6bd86977 100644 --- a/spec/system/budgets/stats_spec.rb +++ b/spec/system/budgets/stats_spec.rb @@ -30,5 +30,11 @@ describe "Stats" do expect(page).not_to have_content "Advanced statistics" end end + + scenario "Back link redirects to budget page" do + visit budget_stats_path(budget) + + expect(page).to have_link("Go back", href: budget_path(budget)) + end end end From f563fc0b246a3e18d94339d7576e4af5fa5f3034 Mon Sep 17 00:00:00 2001 From: Alberto Date: Fri, 3 Nov 2023 10:57:24 +0100 Subject: [PATCH 3/3] Replace back link on budget executions --- app/views/budgets/executions/show.html.erb | 2 +- spec/system/budgets/executions_spec.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/budgets/executions/show.html.erb b/app/views/budgets/executions/show.html.erb index acb4f3822..dc4748239 100644 --- a/app/views/budgets/executions/show.html.erb +++ b/app/views/budgets/executions/show.html.erb @@ -15,7 +15,7 @@
- <%= back_link_to budgets_path %> + <%= back_link_to budget_path(@budget) %>

<%= t("budgets.executions.heading") %>
<%= @budget.name %> diff --git a/spec/system/budgets/executions_spec.rb b/spec/system/budgets/executions_spec.rb index d9a789434..5b721e257 100644 --- a/spec/system/budgets/executions_spec.rb +++ b/spec/system/budgets/executions_spec.rb @@ -76,6 +76,12 @@ describe "Executions" do expect(page).to have_content("No winner investments in this state") end + scenario "Back link redirects to budget page" do + visit budget_executions_path(budget) + + expect(page).to have_link("Go back", href: budget_path(budget)) + end + context "Images" do scenario "renders milestone image if available" do milestone1 = create(:milestone, :with_image, milestoneable: investment1)