From 1169c1090706c259277f235f4dd74fe008113a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 8 May 2018 13:02:50 +0200 Subject: [PATCH 1/2] Add condition to show only selected investments in publishing_prices phase --- app/controllers/application_controller.rb | 2 +- spec/features/budgets/budgets_spec.rb | 12 ++++++++++++ spec/features/budgets/investments_spec.rb | 21 +++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f03a05239..2e9b13462 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -117,7 +117,7 @@ class ApplicationController < ActionController::Base end def set_default_budget_filter - if @budget.try(:balloting?) + if @budget.try(:balloting?) || @budget.try(:publishing_prices?) params[:filter] ||= "selected" end end diff --git a/spec/features/budgets/budgets_spec.rb b/spec/features/budgets/budgets_spec.rb index cd1ee6cd5..6ed8621ff 100644 --- a/spec/features/budgets/budgets_spec.rb +++ b/spec/features/budgets/budgets_spec.rb @@ -216,6 +216,18 @@ feature 'Budgets' do expect(page).not_to have_link "See unfeasible investments" expect(page).not_to have_link "See investments not selected for balloting phase" + budget.update(phase: :publishing_prices) + + visit budget_path(budget) + + expect(page).not_to have_link "See unfeasible investments" + expect(page).not_to have_link "See investments not selected for balloting phase" + + click_link group.name + + expect(page).not_to have_link "See unfeasible investments" + expect(page).not_to have_link "See investments not selected for balloting phase" + budget.update(phase: :balloting) visit budget_path(budget) diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index b9b590a6f..26742c05f 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -1216,6 +1216,27 @@ feature 'Budget Investments' do end + context "Publishing prices phase" do + + background do + budget.update(phase: "publishing_prices") + end + + scenario "Heading index - should show only selected investments" do + investment1 = create(:budget_investment, :selected, heading: heading, price: 10000) + investment2 = create(:budget_investment, :selected, heading: heading, price: 15000) + investment3 = create(:budget_investment, heading: heading, price: 30000) + + visit budget_investments_path(budget, heading: heading) + + within("#budget-investments") do + expect(page).to have_content investment1.title + expect(page).to have_content investment2.title + expect(page).not_to have_content investment3.title + end + end + end + context "Balloting Phase" do background do From 2c0475fc546e680e69c3c48e3093ec61f2d5683d Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Tue, 29 May 2018 09:19:43 -0400 Subject: [PATCH 2/2] Fix failing specs for budget investments tags --- spec/features/tags/budget_investments_spec.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/spec/features/tags/budget_investments_spec.rb b/spec/features/tags/budget_investments_spec.rb index 10af17323..8dad52cff 100644 --- a/spec/features/tags/budget_investments_spec.rb +++ b/spec/features/tags/budget_investments_spec.rb @@ -250,10 +250,8 @@ feature 'Tags' do Budget::Phase::PHASE_KINDS.each do |phase| budget.update(phase: phase) - if budget.balloting? - [investment1, investment2, investment3].each do |investment| - investment.update(selected: true, feasibility: "feasible") - end + [investment1, investment2, investment3].each do |investment| + investment.update(selected: true, feasibility: "feasible") end login_as(admin) if budget.drafting? @@ -297,10 +295,8 @@ feature 'Tags' do Budget::Phase::PHASE_KINDS.each do |phase| budget.update(phase: phase) - if budget.balloting? - [investment1, investment2, investment3].each do |investment| - investment.update(selected: true, feasibility: "feasible") - end + [investment1, investment2, investment3].each do |investment| + investment.update(selected: true, feasibility: "feasible") end login_as(admin) if budget.drafting?