From 375fbf775f30881a6bf2fb373802e9d96f94818b Mon Sep 17 00:00:00 2001 From: Marko Lovic Date: Mon, 23 Jul 2018 20:09:01 +0200 Subject: [PATCH] Order non-city headings by alphabetical order --- .../budgets/executions_controller.rb | 2 +- spec/features/budgets/executions_spec.rb | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/controllers/budgets/executions_controller.rb b/app/controllers/budgets/executions_controller.rb index 7828ca8ec..f0b3f5d57 100644 --- a/app/controllers/budgets/executions_controller.rb +++ b/app/controllers/budgets/executions_controller.rb @@ -11,7 +11,7 @@ module Budgets .includes(investments: :milestones) .joins(investments: :milestones) .distinct - .order(id: :asc) + .order(name: :asc) if params[:status].present? @headings = @headings.where(filter_investment_by_latest_milestone, params[:status]) diff --git a/spec/features/budgets/executions_spec.rb b/spec/features/budgets/executions_spec.rb index 5ac7f9cfd..e2e4d8061 100644 --- a/spec/features/budgets/executions_spec.rb +++ b/spec/features/budgets/executions_spec.rb @@ -207,5 +207,23 @@ feature 'Executions' do expect(city_heading.name).to appear_before(other_heading1.name) expect(city_heading.name).to appear_before(other_heading2.name) end + + scenario 'Non-city headings are displayed in alphabetical order' do + heading.destroy! + z_heading = create_heading_with_investment_with_milestone(group: group, name: 'Zzz') + a_heading = create_heading_with_investment_with_milestone(group: group, name: 'Aaa') + m_heading = create_heading_with_investment_with_milestone(group: group, name: 'Mmm') + + visit budget_path(budget) + click_link 'See results' + + expect(page).to have_link('Milestones') + + click_link 'Milestones' + + expect(page).to have_css('.budget-execution', count: 3) + expect(a_heading.name).to appear_before(m_heading.name) + expect(m_heading.name).to appear_before(z_heading.name) + end end end