From 43137df4a53afec9228c1c37a0ade8a05eb0cd70 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 24 Jan 2018 01:05:47 +0100 Subject: [PATCH 1/5] Format heading price at admin table --- app/views/admin/budgets/_heading.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/budgets/_heading.html.erb b/app/views/admin/budgets/_heading.html.erb index bc9d59c5f..ba53a1d36 100644 --- a/app/views/admin/budgets/_heading.html.erb +++ b/app/views/admin/budgets/_heading.html.erb @@ -3,7 +3,7 @@ <%= heading.name %> - <%= heading.price %> + <%= heading.budget.formatted_heading_price(heading) %> <%= heading.population %> From d75fd596841d4911ccae9a9faaac5b8c7c11b346 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 24 Jan 2018 01:06:18 +0100 Subject: [PATCH 2/5] Align right heading amount & population at admin table --- app/views/admin/budgets/_group.html.erb | 4 ++-- app/views/admin/budgets/_heading.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/budgets/_group.html.erb b/app/views/admin/budgets/_group.html.erb index 8f3fbe2cc..c3ce314aa 100644 --- a/app/views/admin/budgets/_group.html.erb +++ b/app/views/admin/budgets/_group.html.erb @@ -20,8 +20,8 @@ <% else %> <%= t("admin.budgets.form.table_heading") %> - <%= t("admin.budgets.form.table_amount") %> - <%= t("admin.budgets.form.table_population") %> + <%= t("admin.budgets.form.table_amount") %> + <%= t("admin.budgets.form.table_population") %> <%= t("admin.actions.actions") %> diff --git a/app/views/admin/budgets/_heading.html.erb b/app/views/admin/budgets/_heading.html.erb index ba53a1d36..da3139a1b 100644 --- a/app/views/admin/budgets/_heading.html.erb +++ b/app/views/admin/budgets/_heading.html.erb @@ -2,10 +2,10 @@ <%= heading.name %> - + <%= heading.budget.formatted_heading_price(heading) %> - + <%= heading.population %> From bd64c4749f8706d855ba38e781598523ea73afa8 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 24 Jan 2018 01:17:37 +0100 Subject: [PATCH 3/5] Update groups & headings management feature spec --- spec/features/admin/budgets_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/admin/budgets_spec.rb b/spec/features/admin/budgets_spec.rb index 7a78a349b..354414b2d 100644 --- a/spec/features/admin/budgets_spec.rb +++ b/spec/features/admin/budgets_spec.rb @@ -270,7 +270,7 @@ feature 'Admin budgets' do expect(page).not_to have_content 'This group has no assigned heading.' expect(page).to have_content 'District 9 reconstruction' - expect(page).to have_content '6785' + expect(page).to have_content '€6,785' expect(page).to have_content '100500' end end @@ -293,7 +293,7 @@ feature 'Admin budgets' do end expect(page).to have_content 'District 2' - expect(page).to have_content '10000' + expect(page).to have_content '€10,000' expect(page).to have_content '6000' end From 2a500a14bc4bc9d776de73f200489b377bfd1030 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 24 Jan 2018 01:20:29 +0100 Subject: [PATCH 4/5] Make budget admin feature spec linelenght compliant --- spec/features/admin/budgets_spec.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/spec/features/admin/budgets_spec.rb b/spec/features/admin/budgets_spec.rb index 354414b2d..e032daf29 100644 --- a/spec/features/admin/budgets_spec.rb +++ b/spec/features/admin/budgets_spec.rb @@ -191,16 +191,19 @@ feature 'Admin budgets' do budget = create(:budget, phase: 'reviewing_ballots') group = create(:budget_group, budget: budget) heading = create(:budget_heading, group: group, price: 4) - unselected_investment = create(:budget_investment, :unselected, heading: heading, price: 1, ballot_lines_count: 3) - winner_investment = create(:budget_investment, :winner, heading: heading, price: 3, ballot_lines_count: 2) - selected_investment = create(:budget_investment, :selected, heading: heading, price: 2, ballot_lines_count: 1) + unselected = create(:budget_investment, :unselected, heading: heading, price: 1, + ballot_lines_count: 3) + winner = create(:budget_investment, :winner, heading: heading, price: 3, + ballot_lines_count: 2) + selected = create(:budget_investment, :selected, heading: heading, price: 2, + ballot_lines_count: 1) visit edit_admin_budget_path(budget) click_link 'Calculate Winner Investments' expect(page).to have_content 'Winners being calculated, it may take a minute.' - expect(page).to have_content winner_investment.title - expect(page).not_to have_content unselected_investment.title - expect(page).not_to have_content selected_investment.title + expect(page).to have_content winner.title + expect(page).not_to have_content unselected.title + expect(page).not_to have_content selected.title end scenario 'For a finished Budget' do From d6a6b99624c2396497250f9232b2bcab632c259e Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 24 Jan 2018 15:06:40 +0100 Subject: [PATCH 5/5] Fix rare flaky test, expect a price not just the number --- spec/features/budgets/investments_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 9bd9ae458..14b00bc0c 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -1210,13 +1210,13 @@ feature 'Budget Investments' do within("#budget_group_#{global_group.id}") do expect(page).to have_content sp1.title - expect(page).to have_content sp1.price + expect(page).to have_content "€#{sp1.price}" expect(page).to have_content sp2.title - expect(page).to have_content sp2.price + expect(page).to have_content "€#{sp2.price}" expect(page).not_to have_content sp3.title - expect(page).not_to have_content sp3.price + expect(page).not_to have_content "#{sp3.price}" end within("#budget_group_#{group.id}") do