Merge pull request #3203 from consul/admin-budgets-form

[Backport] Show current phase as selected on phase select on admin budgets form

app/views/admin/budgets/_form.html.erb

@@ -6,7 +6,7 @@
 
   <div class="margin-top">
     <div class="small-12 medium-6 column">
-      <%= f.select :phase, budget_phases_select_options, selected: "drafting" %>
+      <%= f.select :phase, budget_phases_select_options %>
     </div>
     <div class="small-12 medium-3 column end">
       <%= f.select :currency_symbol, budget_currency_symbol_select_options %>

spec/features/admin/budgets_spec.rb

@@ -144,9 +144,13 @@ feature 'Admin budgets' do
     let!(:budget) { create(:budget) }
 
     scenario 'Show phases table' do
+      budget.update(phase: "selecting")
+
       visit admin_budgets_path
       click_link 'Edit budget'
 
+      expect(page).to have_select("budget_phase", selected: "Selecting projects")
+
       within '#budget-phases-table' do
 
         Budget::Phase::PHASE_KINDS.each do |phase_kind|