Merge branch 'master' into feature/2275#destroy_budgets

spec/features/admin/budgets_spec.rb

@@ -34,32 +34,32 @@ feature 'Admin budgets' do
     end
 
     scenario 'Filters by phase' do
-      budget1 = create(:budget)
-      budget2 = create(:budget, :accepting)
-      budget3 = create(:budget, :selecting)
-      budget4 = create(:budget, :balloting)
-      budget5 = create(:budget, :finished)
+      drafting_budget  = create(:budget, :drafting)
+      accepting_budget = create(:budget, :accepting)
+      selecting_budget = create(:budget, :selecting)
+      balloting_budget = create(:budget, :balloting)
+      finished_budget  = create(:budget, :finished)
 
       visit admin_budgets_path
-      expect(page).to have_content(budget1.name)
-      expect(page).to have_content(budget2.name)
-      expect(page).to have_content(budget3.name)
-      expect(page).to have_content(budget4.name)
-      expect(page).not_to have_content(budget5.name)
+      expect(page).to have_content(drafting_budget.name)
+      expect(page).to have_content(accepting_budget.name)
+      expect(page).to have_content(selecting_budget.name)
+      expect(page).to have_content(balloting_budget.name)
+      expect(page).not_to have_content(finished_budget.name)
 
       click_link 'Finished'
-      expect(page).not_to have_content(budget1.name)
-      expect(page).not_to have_content(budget2.name)
-      expect(page).not_to have_content(budget3.name)
-      expect(page).not_to have_content(budget4.name)
-      expect(page).to have_content(budget5.name)
+      expect(page).not_to have_content(drafting_budget.name)
+      expect(page).not_to have_content(accepting_budget.name)
+      expect(page).not_to have_content(selecting_budget.name)
+      expect(page).not_to have_content(balloting_budget.name)
+      expect(page).to have_content(finished_budget.name)
 
       click_link 'Open'
-      expect(page).to have_content(budget1.name)
-      expect(page).to have_content(budget2.name)
-      expect(page).to have_content(budget3.name)
-      expect(page).to have_content(budget4.name)
-      expect(page).not_to have_content(budget5.name)
+      expect(page).to have_content(drafting_budget.name)
+      expect(page).to have_content(accepting_budget.name)
+      expect(page).to have_content(selecting_budget.name)
+      expect(page).to have_content(balloting_budget.name)
+      expect(page).not_to have_content(finished_budget.name)
     end
 
     scenario 'Open filter is properly highlighted' do
@@ -133,6 +133,24 @@ feature 'Admin budgets' do
       expect(page).to have_content('You cannot destroy a Budget that has associated investments')
       expect(page).to have_content('There is 1 participatory budget')
     end
+  end
+  
+  context 'Update' do
+
+    background do
+      create(:budget)
+    end
+
+    scenario 'Update budget' do
+      visit admin_budgets_path
+      click_link 'Edit budget'
+
+      fill_in 'budget_name', with: 'More trees on the streets'
+      click_button 'Update Participatory budget'
+
+      expect(page).to have_content('More trees on the streets')
+      expect(page).to have_current_path(admin_budgets_path)
+    end
 
   end