Merge branch 'master' into legislation-module-stable

2017-03-25 13:34:49 +01:00
parent fc681e1162 821eed01d0
commit 5caa31dba1
23 changed files with 107 additions and 32 deletions
--- a/spec/features/admin/budgets_spec.rb
+++ b/spec/features/admin/budgets_spec.rb
@@ -84,7 +84,7 @@ feature 'Admin budgets' do

      fill_in 'budget_name', with: 'M30 - Summer campaign'
      fill_in 'budget_description_accepting', with: 'Budgeting for summer 2017 maintenance and improvements of the road M-30'
-      select 'Accepting proposals', from: 'budget[phase]'
+      select 'Accepting projects', from: 'budget[phase]'

      click_button 'Create Participatory budget'