From 5b5557c67c43387c02345ecf0636bfcf9ef8ec0d Mon Sep 17 00:00:00 2001
From: Semyon Pupkov <mail@semyonpupkov.com>
Date: Sun, 11 Feb 2018 12:16:35 +0500
Subject: [PATCH] Move feature group members search test to RSpec

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
---
 features/group/members.feature                | 12 --------
 features/steps/group/members.rb               | 15 ----------
 .../groups/members/search_members_spec.rb     | 29 +++++++++++++++++++
 3 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 features/group/members.feature
 create mode 100644 spec/features/groups/members/search_members_spec.rb

diff --git a/features/group/members.feature b/features/group/members.feature
deleted file mode 100644
index 49a44f57cbb..00000000000
--- a/features/group/members.feature
+++ /dev/null
@@ -1,12 +0,0 @@
-Feature: Group Members
-  Background:
-    Given I sign in as "John Doe"
-    And "John Doe" is owner of group "Owned"
-    And "John Doe" is guest of group "Guest"
-
-  Scenario: Search member by name
-    Given "Mary Jane" is guest of group "Guest"
-    And I visit group "Guest" members page
-    When I search for 'Mary' member
-    Then I should see user "Mary Jane" in team list
-    Then I should not see user "John Doe" in team list
diff --git a/features/steps/group/members.rb b/features/steps/group/members.rb
index 0ab1012660c..97bcca7730b 100644
--- a/features/steps/group/members.rb
+++ b/features/steps/group/members.rb
@@ -9,14 +9,6 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps
     expect(group_members_list).to have_content("John Doe")
   end
 
-  step 'I should not see user "John Doe" in team list' do
-    expect(group_members_list).not_to have_content("John Doe")
-  end
-
-  step 'I should see user "Mary Jane" in team list' do
-    expect(group_members_list).to have_content("Mary Jane")
-  end
-
   step 'I should not see user "Mary Jane" in team list' do
     expect(group_members_list).not_to have_content("Mary Jane")
   end
@@ -41,13 +33,6 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps
     # poltergeist always confirms popups.
   end
 
-  step 'I search for \'Mary\' member' do
-    page.within '.member-search-form' do
-      fill_in 'search', with: 'Mary'
-      find('.member-search-btn').click
-    end
-  end
-
   step 'I change the "Mary Jane" role to "Developer"' do
     member = mary_jane_member
 
diff --git a/spec/features/groups/members/search_members_spec.rb b/spec/features/groups/members/search_members_spec.rb
new file mode 100644
index 00000000000..31fbbcf562c
--- /dev/null
+++ b/spec/features/groups/members/search_members_spec.rb
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'Search group member' do
+  let(:user) { create :user }
+  let(:member) { create :user }
+
+  let!(:guest_group) do
+    create(:group) do |group|
+      group.add_guest(user)
+      group.add_guest(member)
+    end
+  end
+
+  before do
+    sign_in(user)
+    visit group_group_members_path(guest_group)
+  end
+
+  it 'renders member users' do
+    page.within '.member-search-form' do
+      fill_in 'search', with: member.name
+      find('.member-search-btn').click
+    end
+
+    group_members_list = find(".panel .content-list")
+    expect(group_members_list).to have_content(member.name)
+    expect(group_members_list).not_to have_content(user.name)
+  end
+end