Merge pull request #1292 from consul/budgets-admin

Budgets admin

app/controllers/admin/budgets_controller.rb

@@ -2,7 +2,7 @@ class Admin::BudgetsController < Admin::BaseController
   include FeatureFlags
   feature_flag :budgets
 
-  has_filters %w{open finished}, only: :index
+  has_filters %w{current finished}, only: :index
 
   load_and_authorize_resource
 

spec/features/admin/budget_investments_spec.rb

@@ -76,7 +76,7 @@ feature 'Admin budget investments' do
       expect(page).to have_link("Change name")
       expect(page).to have_link("Plant trees")
 
-      select "Central Park", from: "heading_id"
+      select "Parks: Central Park", from: "heading_id"
 
       expect(page).to_not have_link("Realocate visitors")
       expect(page).to_not have_link("Change name")
@@ -88,31 +88,13 @@ feature 'Admin budget investments' do
       expect(page).to have_link("Change name")
       expect(page).to have_link("Plant trees")
 
-      select "Main Avenue", from: "heading_id"
+      select "Streets: Main Avenue", from: "heading_id"
 
       expect(page).to have_link("Realocate visitors")
       expect(page).to_not have_link("Change name")
       expect(page).to_not have_link("Plant trees")
 
-      select "Mercy Street", from: "heading_id"
-
-      expect(page).to_not have_link("Realocate visitors")
-      expect(page).to have_link("Change name")
-      expect(page).to_not have_link("Plant trees")
-
-      click_link("Change name")
-      click_link("Go back")
-
-      expect(page).to_not have_link("Realocate visitors")
-      expect(page).to have_link("Change name")
-      expect(page).to_not have_link("Plant trees")
-
-      click_link("Change name")
-      click_link("Edit classification")
-      expect(page).to have_button("Update")
-      click_link("Go back")
-      expect(page).to_not have_button("Update")
-      click_link("Go back")
+      select "Streets: Mercy Street", from: "heading_id"
 
       expect(page).to_not have_link("Realocate visitors")
       expect(page).to have_link("Change name")
@@ -143,22 +125,6 @@ feature 'Admin budget investments' do
       expect(page).to have_link("Realocate visitors")
 
       select "Admin 1", from: "administrator_id"
-      expect(page).to have_content('There is 1 investment')
-
-      click_link("Realocate visitors")
-      click_link("Go back")
-
-      expect(page).to have_content('There is 1 investment')
-      expect(page).to_not have_link("Destroy the city")
-      expect(page).to have_link("Realocate visitors")
-
-      click_link("Realocate visitors")
-      click_link("Edit classification")
-      expect(page).to have_button("Update")
-      click_link("Go back")
-      expect(page).to_not have_button("Update")
-      click_link("Go back")
-
       expect(page).to have_content('There is 1 investment')
       expect(page).to_not have_link("Destroy the city")
       expect(page).to have_link("Realocate visitors")
@@ -190,21 +156,6 @@ feature 'Admin budget investments' do
       expect(page).to have_link("Realocate visitors")
 
       select "Valuator 1", from: "valuator_id"
-      expect(page).to have_content('There is 1 investment')
-      click_link("Realocate visitors")
-      click_link("Go back")
-
-      expect(page).to have_content('There is 1 investment')
-      expect(page).to_not have_link("Destroy the city")
-      expect(page).to have_link("Realocate visitors")
-
-      click_link("Realocate visitors")
-      click_link("Edit classification")
-      expect(page).to have_button("Update")
-      click_link("Go back")
-      expect(page).to_not have_button("Update")
-      click_link("Go back")
-
       expect(page).to have_content('There is 1 investment')
       expect(page).to_not have_link("Destroy the city")
       expect(page).to have_link("Realocate visitors")
@@ -299,24 +250,6 @@ feature 'Admin budget investments' do
       expect(page).to have_css(".budget_investment", count: 2)
       expect(page).to have_content("Educate the children")
       expect(page).to have_content("More schools")
-
-      click_link("Educate the children")
-      click_link("Go back")
-
-      expect(page).to_not have_content("More hospitals")
-      expect(page).to have_content("Educate the children")
-      expect(page).to have_content("More schools")
-
-      click_link("Educate the children")
-      click_link("Edit classification")
-      expect(page).to have_button("Update")
-      click_link("Go back")
-      expect(page).to_not have_button("Update")
-      click_link("Go back")
-
-      expect(page).to_not have_content("More hospitals")
-      expect(page).to have_content("Educate the children")
-      expect(page).to have_content("More schools")
     end
 
   end
@@ -464,4 +397,4 @@ feature 'Admin budget investments' do
 
   end
 
-end
+end

spec/features/admin/budgets_spec.rb

@@ -47,7 +47,7 @@ feature 'Admin budgets' do
       expect(page).to_not have_content(budget4.name)
       expect(page).to have_content(budget5.name)
 
-      click_link 'Open'
+      click_link 'Current'
       expect(page).to have_content(budget1.name)
       expect(page).to have_content(budget2.name)
       expect(page).to have_content(budget3.name)
@@ -56,7 +56,7 @@ feature 'Admin budgets' do
     end
 
     scenario 'Current filter is properly highlighted' do
-      filters_links = {'open' => 'Open', 'finished' => 'Finished'}
+      filters_links = {'current' => 'Current', 'finished' => 'Finished'}
 
       visit admin_budgets_path
 
@@ -158,4 +158,4 @@ feature 'Admin budgets' do
     end
 
   end
-end
+end