Merge pull request #2657 from wairbut-m2c/backport/display-selected-budgets
Display only selected budget investmests in "Publishing prices" phase
This commit is contained in:
@@ -117,7 +117,7 @@ class ApplicationController < ActionController::Base
|
|||||||
end
|
end
|
||||||
|
|
||||||
def set_default_budget_filter
|
def set_default_budget_filter
|
||||||
if @budget.try(:balloting?)
|
if @budget.try(:balloting?) || @budget.try(:publishing_prices?)
|
||||||
params[:filter] ||= "selected"
|
params[:filter] ||= "selected"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -216,6 +216,18 @@ feature 'Budgets' do
|
|||||||
expect(page).not_to have_link "See unfeasible investments"
|
expect(page).not_to have_link "See unfeasible investments"
|
||||||
expect(page).not_to have_link "See investments not selected for balloting phase"
|
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)
|
budget.update(phase: :balloting)
|
||||||
|
|
||||||
visit budget_path(budget)
|
visit budget_path(budget)
|
||||||
|
|||||||
@@ -1216,6 +1216,27 @@ feature 'Budget Investments' do
|
|||||||
|
|
||||||
end
|
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
|
context "Balloting Phase" do
|
||||||
|
|
||||||
background do
|
background do
|
||||||
|
|||||||
@@ -250,11 +250,9 @@ feature 'Tags' do
|
|||||||
Budget::Phase::PHASE_KINDS.each do |phase|
|
Budget::Phase::PHASE_KINDS.each do |phase|
|
||||||
budget.update(phase: phase)
|
budget.update(phase: phase)
|
||||||
|
|
||||||
if budget.balloting?
|
|
||||||
[investment1, investment2, investment3].each do |investment|
|
[investment1, investment2, investment3].each do |investment|
|
||||||
investment.update(selected: true, feasibility: "feasible")
|
investment.update(selected: true, feasibility: "feasible")
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
login_as(admin) if budget.drafting?
|
login_as(admin) if budget.drafting?
|
||||||
visit budget_path(budget)
|
visit budget_path(budget)
|
||||||
@@ -297,11 +295,9 @@ feature 'Tags' do
|
|||||||
Budget::Phase::PHASE_KINDS.each do |phase|
|
Budget::Phase::PHASE_KINDS.each do |phase|
|
||||||
budget.update(phase: phase)
|
budget.update(phase: phase)
|
||||||
|
|
||||||
if budget.balloting?
|
|
||||||
[investment1, investment2, investment3].each do |investment|
|
[investment1, investment2, investment3].each do |investment|
|
||||||
investment.update(selected: true, feasibility: "feasible")
|
investment.update(selected: true, feasibility: "feasible")
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
login_as(admin) if budget.drafting?
|
login_as(admin) if budget.drafting?
|
||||||
visit budget_path(budget)
|
visit budget_path(budget)
|
||||||
|
|||||||
Reference in New Issue
Block a user