Merge pull request #3509 from consul/menu-users

Users menu

spec/features/admin/budget_investments_spec.rb

@@ -1542,7 +1542,7 @@ feature "Admin budget investments" do
 
       login_as(valuator.user.reload)
       visit root_path
-      click_link "Admin"
+      click_link "Menu"
       click_link "Valuation"
 
       within "#budget_#{budget.id}" do

spec/features/management_spec.rb

@@ -12,7 +12,7 @@ feature "Management" do
 
     click_link "Management"
 
-    expect(page).to have_content("My activity")
+    expect(page).to have_content("My content")
     expect(page).to have_content("My account")
     expect(page).to have_content("Sign out")
   end
@@ -26,7 +26,7 @@ feature "Management" do
 
     click_link "Management"
 
-    expect(page).not_to have_content("My activity")
+    expect(page).not_to have_content("My content")
     expect(page).not_to have_content("My account")
     expect(page).not_to have_content("Sign out")
   end

spec/features/officing_spec.rb

@@ -118,6 +118,7 @@ feature "Poll Officing" do
 
     expect(page).to have_current_path(officing_root_path)
     expect(page).to have_css("#officing_menu")
+    expect(page).not_to have_link("Polling officers")
     expect(page).not_to have_css("#valuation_menu")
     expect(page).not_to have_css("#admin_menu")
     expect(page).not_to have_css("#moderation_menu")

spec/features/proposal_notifications_spec.rb

@@ -9,7 +9,7 @@ feature "Proposal Notifications" do
     login_as(author)
     visit root_path
 
-    click_link "My activity"
+    click_link "My content"
     click_link proposal.title
     click_link "Access the community"
     click_link "Send message to the community"

spec/features/users_auth_spec.rb

@@ -75,7 +75,7 @@ feature "Users" do
 
         visit account_path
 
-        expect(page).to have_link "My activity", href: user_path(u1)
+        expect(page).to have_link "My content", href: user_path(u1)
 
         visit "/"
         click_link "Sign out"
@@ -98,7 +98,7 @@ feature "Users" do
 
         visit account_path
 
-        expect(page).to have_link "My activity", href: user_path(u2)
+        expect(page).to have_link "My content", href: user_path(u2)
       end
     end
   end