Adds user admin capabilities and missing i18n entries

spec/features/admin/users_spec.rb

@@ -2,60 +2,20 @@ require 'rails_helper'
 
 feature 'Admin users' do
 
-  scenario 'Restore hidden user' do
-    citizen = create(:user)
+  background do
     admin = create(:administrator)
-    create(:moderator, user: admin.user)
-
-    debate_previously_hidden = create(:debate, :hidden, author: citizen)
-    debate = create(:debate, author: citizen)
-    comment_previously_hidden = create(:comment, :hidden, user: citizen, commentable: debate, body: "You have the manners of a beggar")
-    comment = create(:comment, user: citizen, commentable: debate, body: 'Not Spam')
-
     login_as(admin.user)
-    visit debate_path(debate)
-
-    within("#debate_#{debate.id}") do
-      click_link 'Ban author'
-    end
-
-    visit debates_path
-    expect(page).to_not have_content(debate.title)
-    expect(page).to_not have_content(debate_previously_hidden)
-
-    click_link "Administration"
-    click_link "Hidden users"
-    click_link "Restore user"
-
-    visit debates_path
-    expect(page).to have_content(debate.title)
-    expect(page).to_not have_content(debate_previously_hidden)
-
-    visit debate_path(debate)
-    expect(page).to have_content(comment.body)
-    expect(page).to_not have_content(comment_previously_hidden.body)
   end
 
   scenario 'Show user activity' do
-    citizen = create(:user)
-    admin = create(:administrator)
-    create(:moderator, user: admin.user)
+    user = create(:user, :hidden)
 
-    debate1 = create(:debate, :hidden, author: citizen)
-    debate2 = create(:debate, author: citizen)
-    comment1 = create(:comment, :hidden, user: citizen, commentable: debate2, body: "You have the manners of a beggar")
-    comment2 = create(:comment, user: citizen, commentable: debate2, body: 'Not Spam')
+    debate1 = create(:debate, :hidden, author: user)
+    debate2 = create(:debate, author: user)
+    comment1 = create(:comment, :hidden, user: user, commentable: debate2, body: "You have the manners of a beggar")
+    comment2 = create(:comment, user: user, commentable: debate2, body: 'Not Spam')
 
-    login_as(admin.user)
-    visit debate_path(debate2)
-
-    within("#debate_#{debate2.id}") do
-      click_link 'Ban author'
-    end
-
-    click_link "Administration"
-    click_link "Hidden users"
-    click_link citizen.name
+    visit admin_user_path(user)
 
     expect(page).to have_content(debate1.title)
     expect(page).to have_content(debate2.title)
@@ -63,4 +23,66 @@ feature 'Admin users' do
     expect(page).to have_content(comment2.body)
   end
 
-end
+  scenario 'Restore' do
+    user = create(:user, :hidden)
+    visit admin_users_path
+
+    click_link 'Restore'
+
+    expect(page).to_not have_content(user.username)
+
+    expect(user.reload).to_not be_hidden
+  end
+
+  scenario 'Confirm hide' do
+    user = create(:user, :hidden)
+    visit admin_users_path
+
+    click_link 'Confirm'
+
+    expect(page).to have_content(user.username)
+    expect(page).to have_content('Confirmed')
+
+    expect(user.reload).to be_confirmed_hide
+  end
+
+  scenario "Current filter is properly highlighted" do
+    visit admin_users_path
+    expect(page).to_not have_link('All')
+    expect(page).to have_link('Confirmed')
+
+    visit admin_users_path(filter: 'all')
+    expect(page).to_not have_link('All')
+    expect(page).to have_link('Confirmed')
+
+    visit admin_users_path(filter: 'with_confirmed_hide')
+    expect(page).to have_link('All')
+    expect(page).to_not have_link('Confirmed')
+  end
+
+  scenario "Filtering users" do
+    create(:user, :hidden, username: "Unconfirmed")
+    create(:user, :hidden, :with_confirmed_hide, username: "Confirmed user")
+
+    visit admin_users_path(filter: 'all')
+    expect(page).to have_content('Unconfirmed')
+    expect(page).to have_content('Confirmed user')
+
+    visit admin_users_path(filter: 'with_confirmed_hide')
+    expect(page).to_not have_content('Unconfirmed')
+    expect(page).to have_content('Confirmed user')
+  end
+
+  scenario "Action links remember the pagination setting and the filter" do
+    per_page = Kaminari.config.default_per_page
+    (per_page + 2).times { create(:user, :hidden, :with_confirmed_hide) }
+
+    visit admin_users_path(filter: 'with_confirmed_hide', page: 2)
+
+    click_on('Restore', match: :first, exact: true)
+
+    expect(current_url).to include('filter=with_confirmed_hide')
+    expect(current_url).to include('page=2')
+  end
+
+end