- <%= render "milestones/progress_bars", milestoneable: milestoneable %>
+ <%= render Milestones::ProgressBarsComponent.new(milestoneable) %>
<% if milestoneable.milestones.blank? %>
diff --git a/app/views/milestones/_progress_bars.html.erb b/app/views/milestones/_progress_bars.html.erb
deleted file mode 100644
index d2612487a..000000000
--- a/app/views/milestones/_progress_bars.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% if milestoneable.primary_progress_bar %>
-
- <%= t("milestones.index.progress") %>
-
-
- <%= progress_tag_for(milestoneable.primary_progress_bar) %>
-
-
- <% if milestoneable.secondary_progress_bars.any? %>
-
- <% milestoneable.secondary_progress_bars.each do |progress_bar| %>
-
-
- <%= progress_bar.title %>
-
-
- <%= progress_tag_for(progress_bar) %>
-
-
- <% end %>
-
-<% end %>
diff --git a/spec/components/milestones/progress_bars_component_spec.rb b/spec/components/milestones/progress_bars_component_spec.rb
new file mode 100644
index 000000000..2919eca5f
--- /dev/null
+++ b/spec/components/milestones/progress_bars_component_spec.rb
@@ -0,0 +1,36 @@
+require "rails_helper"
+
+describe Milestones::ProgressBarsComponent do
+ let(:milestoneable) { create(:legislation_process) }
+
+ it "is not rendered without a main progress bar" do
+ create(:progress_bar, :secondary, progressable: milestoneable, title: "Defeat Evil Lords")
+
+ render_inline Milestones::ProgressBarsComponent.new(milestoneable)
+
+ expect(page).not_to be_rendered
+ end
+
+ it "renders a main progress bar" do
+ create(:progress_bar, progressable: milestoneable)
+
+ render_inline Milestones::ProgressBarsComponent.new(milestoneable)
+
+ expect(page).to have_content "Progress"
+ expect(page).to have_css "[role=progressbar]", count: 1
+ expect(page).to have_css "[role=progressbar][aria-label='Progress']"
+ end
+
+ it "renders both main and secondary progress bars" do
+ create(:progress_bar, progressable: milestoneable)
+ create(:progress_bar, :secondary, progressable: milestoneable, title: "Build laboratory")
+
+ render_inline Milestones::ProgressBarsComponent.new(milestoneable)
+
+ expect(page).to have_content "Progress"
+ expect(page).to have_content "Build laboratory"
+ expect(page).to have_css "[role=progressbar]", count: 2
+ expect(page).to have_css "[role=progressbar][aria-label='Progress']"
+ expect(page).to have_css "[role=progressbar][aria-label='Build laboratory']"
+ end
+end
diff --git a/spec/system/budgets/ballots_spec.rb b/spec/system/budgets/ballots_spec.rb
index 2be0cdd0f..727b996f9 100644
--- a/spec/system/budgets/ballots_spec.rb
+++ b/spec/system/budgets/ballots_spec.rb
@@ -103,15 +103,23 @@ describe "Ballots" do
end
context "Adding and Removing Investments" do
- scenario "Add a investment" do
+ scenario "Add an investment" do
create(:budget_investment, :selected, heading: new_york, price: 10000, title: "Bring back King Kong")
create(:budget_investment, :selected, heading: new_york, price: 20000, title: "Paint cabs black")
visit budget_investments_path(budget, heading_id: new_york)
+
+ within("#progress_bar") do
+ expect(page).to have_css "#total_amount", exact_text: "AMOUNT SPENT €0 / TOTAL BUDGET €1,000,000"
+ expect(page).to have_css "[role=progressbar][aria-labelledby='total_amount']"
+ end
+
add_to_ballot("Bring back King Kong")
- expect(page).to have_css("#total_amount", text: "€10,000")
- expect(page).to have_css("#amount_available", text: "€990,000")
+ within("#progress_bar") do
+ expect(page).to have_css("#total_amount", text: "€10,000")
+ expect(page).to have_css("#amount_available", text: "€990,000")
+ end
within("#sidebar") do
expect(page).to have_content "Bring back King Kong"
@@ -268,18 +276,6 @@ describe "Ballots" do
expect(page).to have_content("You have active votes in another heading: District 1")
end
end
-
- scenario "Display progress bar after first vote" do
- create(:budget_investment, :selected, heading: new_york, price: 10000, title: "Park expansion")
-
- visit budget_investments_path(budget, heading_id: new_york.id)
-
- add_to_ballot("Park expansion")
-
- within("#progress_bar") do
- expect(page).to have_css("#total_amount", text: "€10,000")
- end
- end
end
context "Groups" do
diff --git a/spec/system/legislation/processes_spec.rb b/spec/system/legislation/processes_spec.rb
index 9061788c4..750760411 100644
--- a/spec/system/legislation/processes_spec.rb
+++ b/spec/system/legislation/processes_spec.rb
@@ -430,17 +430,7 @@ describe "Legislation" do
end
end
- scenario "With main progress bar" do
- create(:progress_bar, progressable: process)
-
- visit milestones_legislation_process_path(process)
-
- within(".tab-milestones") do
- expect(page).to have_content "Progress"
- end
- end
-
- scenario "With main and secondary progress bar" do
+ scenario "With progress bars" do
create(:progress_bar, progressable: process)
create(:progress_bar, :secondary, progressable: process, title: "Build laboratory")
@@ -451,17 +441,6 @@ describe "Legislation" do
expect(page).to have_content "Build laboratory"
end
end
-
- scenario "No main progress bar" do
- create(:progress_bar, :secondary, progressable: process, title: "Defeat Evil Lords")
-
- visit milestones_legislation_process_path(process)
-
- within(".tab-milestones") do
- expect(page).not_to have_content "Progress"
- expect(page).not_to have_content "Defeat Evil Lords"
- end
- end
end
end
end