Fix losing search query when sort users on admin users page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

5 files changed, 73 insertions, 24 deletions

diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index d5516b334b9..27f1d777274 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe "Admin::Users" do
+  include Spec::Support::Helpers::Features::RowsHelpers
+
   let!(:user) do
     create(:omniauth_user, provider: 'twitter', extern_uid: '123456')
   end
@@ -30,6 +32,41 @@ describe "Admin::Users" do
       expect(page).to have_button('Delete user and contributions')
     end
 
+    describe 'search and sort' do
+      before do
+        create(:user, name: 'Foo Bar')
+        create(:user, name: 'Foo Baz')
+        create(:user, name: 'Dmitriy')
+      end
+
+      it 'search users by name' do
+        visit admin_users_path(search_query: 'Foo')
+
+        expect(page).to have_content('Foo Bar')
+        expect(page).to have_content('Foo Baz')
+        expect(page).not_to have_content('Dmitriy')
+      end
+
+      it 'sorts users by name' do
+        visit admin_users_path
+
+        sort_by('Name')
+
+        expect(first_row.text).to include('Dmitriy')
+        expect(second_row.text).to include('Foo Bar')
+      end
+
+      it 'sorts search results only' do
+        visit admin_users_path(search_query: 'Foo')
+
+        sort_by('Name')
+
+        expect(page).not_to have_content('Dmitriy')
+        expect(first_row.text).to include('Foo Bar')
+        expect(second_row.text).to include('Foo Baz')
+      end
+    end
+
     describe 'Two-factor Authentication filters' do
       it 'counts users who have enabled 2FA' do
         create(:user, :two_factor)
@@ -566,4 +603,10 @@ describe "Admin::Users" do
   def check_breadcrumb(content)
     expect(find('.breadcrumbs-sub-title')).to have_content(content)
   end
+
+  def sort_by(text)
+    page.within('.user-sort-dropdown') do
+      click_link text
+    end
+  end
 end
diff --git a/spec/features/groups/members/list_members_spec.rb b/spec/features/groups/members/list_members_spec.rb
index e1587a8b6a5..0df504f5324 100644
--- a/spec/features/groups/members/list_members_spec.rb
+++ b/spec/features/groups/members/list_members_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'Groups > Members > List members' do
   include Select2Helper
+  include Spec::Support::Helpers::Features::RowsHelpers
 
   let(:user1) { create(:user, name: 'John Doe') }
   let(:user2) { create(:user, name: 'Mary Jane') }
@@ -43,12 +44,4 @@ describe 'Groups > Members > List members' do
       let(:user_with_status) { user2 }
     end
   end
-
-  def first_row
-    page.all('ul.content-list > li')[0]
-  end
-
-  def second_row
-    page.all('ul.content-list > li')[1]
-  end
 end
diff --git a/spec/features/groups/members/manage_members_spec.rb b/spec/features/groups/members/manage_members_spec.rb
index 0eda2c7f26d..6da0312af2c 100644
--- a/spec/features/groups/members/manage_members_spec.rb
+++ b/spec/features/groups/members/manage_members_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'Groups > Members > Manage members' do
   include Select2Helper
+  include Spec::Support::Helpers::Features::RowsHelpers
 
   let(:user1) { create(:user, name: 'John Doe') }
   let(:user2) { create(:user, name: 'Mary Jane') }
@@ -119,14 +120,6 @@ describe 'Groups > Members > Manage members' do
     end
   end
 
-  def first_row
-    page.all('ul.content-list > li')[0]
-  end
-
-  def second_row
-    page.all('ul.content-list > li')[1]
-  end
-
   def add_user(id, role)
     page.within ".users-group-form" do
       select2(id, from: "#user_ids", multiple: true)
diff --git a/spec/features/projects/members/list_spec.rb b/spec/features/projects/members/list_spec.rb
index c2e980e75b8..b6f46a5544c 100644
--- a/spec/features/projects/members/list_spec.rb
+++ b/spec/features/projects/members/list_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'Project members list' do
   include Select2Helper
+  include Spec::Support::Helpers::Features::RowsHelpers
 
   let(:user1) { create(:user, name: 'John Doe') }
   let(:user2) { create(:user, name: 'Mary Jane') }
@@ -83,14 +84,6 @@ describe 'Project members list' do
     end
   end
 
-  def first_row
-    page.all('ul.content-list > li')[0]
-  end
-
-  def second_row
-    page.all('ul.content-list > li')[1]
-  end
-
   def add_user(id, role)
     page.within ".users-project-form" do
       select2(id, from: "#user_ids", multiple: true)
diff --git a/spec/support/helpers/features/rows_helpers.rb b/spec/support/helpers/features/rows_helpers.rb
new file mode 100644
index 00000000000..5e614f40a24
--- /dev/null
+++ b/spec/support/helpers/features/rows_helpers.rb
@@ -0,0 +1,27 @@
+# These helpers allow you to access rows in the list
+#
+# Usage:
+#   describe "..." do
+#     include Spec::Support::Helpers::Features::RowsHelpers
+#     ...
+#
+#     expect(first_row.text).to include("John Doe")
+#     expect(second_row.text).to include("John Smith")
+#
+module Spec
+  module Support
+    module Helpers
+      module Features
+        module RowsHelpers
+          def first_row
+            page.all('ul.content-list > li')[0]
+          end
+
+          def second_row
+            page.all('ul.content-list > li')[1]
+          end
+        end
+      end
+    end
+  end
+end