Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

4 files changed, 179 insertions, 72 deletions

diff --git a/spec/features/groups/members/filter_members_spec.rb b/spec/features/groups/members/filter_members_spec.rb
index b6d33b3f4aa..917b35659a6 100644
--- a/spec/features/groups/members/filter_members_spec.rb
+++ b/spec/features/groups/members/filter_members_spec.rb
@@ -11,8 +11,7 @@ RSpec.describe 'Groups > Members > Filter members', :js do
   let(:group)             { create(:group) }
   let(:nested_group)      { create(:group, parent: group) }
 
-  two_factor_auth_dropdown_toggle_selector = '[data-testid="member-filter-2fa-dropdown"] [data-testid="dropdown-toggle"]'
-  active_inherited_members_filter_selector = '[data-testid="filter-members-with-inherited-permissions"] a.is-active'
+  filtered_search_bar_selector = '[data-testid="members-filtered-search-bar"]'
 
   before do
     group.add_owner(user)
@@ -27,7 +26,6 @@ RSpec.describe 'Groups > Members > Filter members', :js do
 
     expect(member(0)).to include(user.name)
     expect(member(1)).to include(user_with_2fa.name)
-    expect(page).to have_css(two_factor_auth_dropdown_toggle_selector, text: 'Everyone')
   end
 
   it 'shows only 2FA members' do
@@ -35,7 +33,10 @@ RSpec.describe 'Groups > Members > Filter members', :js do
 
     expect(member(0)).to include(user_with_2fa.name)
     expect(all_rows.size).to eq(1)
-    expect(page).to have_css(two_factor_auth_dropdown_toggle_selector, text: 'Enabled')
+
+    within filtered_search_bar_selector do
+      expect(page).to have_content '2FA = Enabled'
+    end
   end
 
   it 'shows only non 2FA members' do
@@ -43,7 +44,10 @@ RSpec.describe 'Groups > Members > Filter members', :js do
 
     expect(member(0)).to include(user.name)
     expect(all_rows.size).to eq(1)
-    expect(page).to have_css(two_factor_auth_dropdown_toggle_selector, text: 'Disabled')
+
+    within filtered_search_bar_selector do
+      expect(page).to have_content '2FA = Disabled'
+    end
   end
 
   it 'shows inherited members by default' do
@@ -53,15 +57,16 @@ RSpec.describe 'Groups > Members > Filter members', :js do
     expect(member(1)).to include(user_with_2fa.name)
     expect(member(2)).to include(nested_group_user.name)
     expect(all_rows.size).to eq(3)
-
-    expect(page).to have_css(active_inherited_members_filter_selector, text: 'Show all members', visible: false)
   end
 
   it 'shows only group members' do
     visit_members_list(nested_group, with_inherited_permissions: 'exclude')
     expect(member(0)).to include(nested_group_user.name)
     expect(all_rows.size).to eq(1)
-    expect(page).to have_css(active_inherited_members_filter_selector, text: 'Show only direct members', visible: false)
+
+    within filtered_search_bar_selector do
+      expect(page).to have_content 'Membership = Direct'
+    end
   end
 
   it 'shows only inherited members' do
@@ -69,7 +74,10 @@ RSpec.describe 'Groups > Members > Filter members', :js do
     expect(member(0)).to include(user.name)
     expect(member(1)).to include(user_with_2fa.name)
     expect(all_rows.size).to eq(2)
-    expect(page).to have_css(active_inherited_members_filter_selector, text: 'Show only inherited members', visible: false)
+
+    within filtered_search_bar_selector do
+      expect(page).to have_content 'Membership = Inherited'
+    end
   end
 
   def visit_members_list(group, options = {})
diff --git a/spec/features/groups/members/search_members_spec.rb b/spec/features/groups/members/search_members_spec.rb
index 0b2d2fd478d..fe5fed307d7 100644
--- a/spec/features/groups/members/search_members_spec.rb
+++ b/spec/features/groups/members/search_members_spec.rb
@@ -21,9 +21,10 @@ RSpec.describe 'Search group member', :js do
   end
 
   it 'renders member users' do
-    page.within '[data-testid="user-search-form"]' do
-      fill_in 'search', with: member.name
-      find('[data-testid="user-search-submit"]').click
+    page.within '[data-testid="members-filtered-search-bar"]' do
+      find_field('Filter members').click
+      find('input').native.send_keys(member.name)
+      click_button 'Search'
     end
 
     expect(members_table).to have_content(member.name)
diff --git a/spec/features/groups/members/sort_members_spec.rb b/spec/features/groups/members/sort_members_spec.rb
index f03cc36df18..68a748aa76a 100644
--- a/spec/features/groups/members/sort_members_spec.rb
+++ b/spec/features/groups/members/sort_members_spec.rb
@@ -9,8 +9,6 @@ RSpec.describe 'Groups > Members > Sort members', :js do
   let(:developer) { create(:user, name: 'Mary Jane', last_sign_in_at: 5.days.ago) }
   let(:group)     { create(:group) }
 
-  dropdown_toggle_selector = '[data-testid="user-sort-dropdown"] [data-testid="dropdown-toggle"]'
-
   before do
     create(:group_member, :owner, user: owner, group: group, created_at: 5.days.ago)
     create(:group_member, :developer, user: developer, group: group, created_at: 3.days.ago)
@@ -18,76 +16,174 @@ RSpec.describe 'Groups > Members > Sort members', :js do
     sign_in(owner)
   end
 
-  it 'sorts alphabetically by default' do
-    visit_members_list(sort: nil)
+  context 'when `group_members_filtered_search` feature flag is enabled' do
+    def expect_sort_by(text, sort_direction)
+      within('[data-testid="members-sort-dropdown"]') do
+        expect(page).to have_css('button[aria-haspopup="true"]', text: text)
+        expect(page).to have_button("Sorting Direction: #{sort_direction == :asc ? 'Ascending' : 'Descending'}")
+      end
+    end
 
-    expect(first_row.text).to include(owner.name)
-    expect(second_row.text).to include(developer.name)
-    expect(page).to have_css(dropdown_toggle_selector, text: 'Name, ascending')
-  end
+    it 'sorts by account by default' do
+      visit_members_list(sort: nil)
 
-  it 'sorts by access level ascending' do
-    visit_members_list(sort: :access_level_asc)
+      expect(first_row.text).to include(owner.name)
+      expect(second_row.text).to include(developer.name)
 
-    expect(first_row.text).to include(developer.name)
-    expect(second_row.text).to include(owner.name)
-    expect(page).to have_css(dropdown_toggle_selector, text: 'Access level, ascending')
-  end
+      expect_sort_by('Account', :asc)
+    end
 
-  it 'sorts by access level descending' do
-    visit_members_list(sort: :access_level_desc)
+    it 'sorts by max role ascending' do
+      visit_members_list(sort: :access_level_asc)
 
-    expect(first_row.text).to include(owner.name)
-    expect(second_row.text).to include(developer.name)
-    expect(page).to have_css(dropdown_toggle_selector, text: 'Access level, descending')
-  end
+      expect(first_row.text).to include(developer.name)
+      expect(second_row.text).to include(owner.name)
 
-  it 'sorts by last joined' do
-    visit_members_list(sort: :last_joined)
+      expect_sort_by('Max role', :asc)
+    end
 
-    expect(first_row.text).to include(developer.name)
-    expect(second_row.text).to include(owner.name)
-    expect(page).to have_css(dropdown_toggle_selector, text: 'Last joined')
-  end
+    it 'sorts by max role descending' do
+      visit_members_list(sort: :access_level_desc)
 
-  it 'sorts by oldest joined' do
-    visit_members_list(sort: :oldest_joined)
+      expect(first_row.text).to include(owner.name)
+      expect(second_row.text).to include(developer.name)
 
-    expect(first_row.text).to include(owner.name)
-    expect(second_row.text).to include(developer.name)
-    expect(page).to have_css(dropdown_toggle_selector, text: 'Oldest joined')
-  end
+      expect_sort_by('Max role', :desc)
+    end
 
-  it 'sorts by name ascending' do
-    visit_members_list(sort: :name_asc)
+    it 'sorts by access granted ascending' do
+      visit_members_list(sort: :last_joined)
 
-    expect(first_row.text).to include(owner.name)
-    expect(second_row.text).to include(developer.name)
-    expect(page).to have_css(dropdown_toggle_selector, text: 'Name, ascending')
-  end
+      expect(first_row.text).to include(developer.name)
+      expect(second_row.text).to include(owner.name)
 
-  it 'sorts by name descending' do
-    visit_members_list(sort: :name_desc)
+      expect_sort_by('Access granted', :asc)
+    end
 
-    expect(first_row.text).to include(developer.name)
-    expect(second_row.text).to include(owner.name)
-    expect(page).to have_css(dropdown_toggle_selector, text: 'Name, descending')
-  end
+    it 'sorts by access granted descending' do
+      visit_members_list(sort: :oldest_joined)
+
+      expect(first_row.text).to include(owner.name)
+      expect(second_row.text).to include(developer.name)
+
+      expect_sort_by('Access granted', :desc)
+    end
+
+    it 'sorts by account ascending' do
+      visit_members_list(sort: :name_asc)
+
+      expect(first_row.text).to include(owner.name)
+      expect(second_row.text).to include(developer.name)
+
+      expect_sort_by('Account', :asc)
+    end
+
+    it 'sorts by account descending' do
+      visit_members_list(sort: :name_desc)
+
+      expect(first_row.text).to include(developer.name)
+      expect(second_row.text).to include(owner.name)
+
+      expect_sort_by('Account', :desc)
+    end
+
+    it 'sorts by last sign-in ascending', :clean_gitlab_redis_shared_state do
+      visit_members_list(sort: :recent_sign_in)
+
+      expect(first_row.text).to include(owner.name)
+      expect(second_row.text).to include(developer.name)
+
+      expect_sort_by('Last sign-in', :asc)
+    end
 
-  it 'sorts by recent sign in', :clean_gitlab_redis_shared_state do
-    visit_members_list(sort: :recent_sign_in)
+    it 'sorts by last sign-in descending', :clean_gitlab_redis_shared_state do
+      visit_members_list(sort: :oldest_sign_in)
 
-    expect(first_row.text).to include(owner.name)
-    expect(second_row.text).to include(developer.name)
-    expect(page).to have_css(dropdown_toggle_selector, text: 'Recent sign in')
+      expect(first_row.text).to include(developer.name)
+      expect(second_row.text).to include(owner.name)
+
+      expect_sort_by('Last sign-in', :desc)
+    end
   end
 
-  it 'sorts by oldest sign in', :clean_gitlab_redis_shared_state do
-    visit_members_list(sort: :oldest_sign_in)
+  context 'when `group_members_filtered_search` feature flag is disabled' do
+    dropdown_toggle_selector = '[data-testid="user-sort-dropdown"] [data-testid="dropdown-toggle"]'
+
+    before do
+      stub_feature_flags(group_members_filtered_search: false)
+    end
+
+    it 'sorts alphabetically by default' do
+      visit_members_list(sort: nil)
+
+      expect(first_row.text).to include(owner.name)
+      expect(second_row.text).to include(developer.name)
+      expect(page).to have_css(dropdown_toggle_selector, text: 'Name, ascending')
+    end
+
+    it 'sorts by access level ascending' do
+      visit_members_list(sort: :access_level_asc)
+
+      expect(first_row.text).to include(developer.name)
+      expect(second_row.text).to include(owner.name)
+      expect(page).to have_css(dropdown_toggle_selector, text: 'Access level, ascending')
+    end
+
+    it 'sorts by access level descending' do
+      visit_members_list(sort: :access_level_desc)
+
+      expect(first_row.text).to include(owner.name)
+      expect(second_row.text).to include(developer.name)
+      expect(page).to have_css(dropdown_toggle_selector, text: 'Access level, descending')
+    end
+
+    it 'sorts by last joined' do
+      visit_members_list(sort: :last_joined)
+
+      expect(first_row.text).to include(developer.name)
+      expect(second_row.text).to include(owner.name)
+      expect(page).to have_css(dropdown_toggle_selector, text: 'Last joined')
+    end
+
+    it 'sorts by oldest joined' do
+      visit_members_list(sort: :oldest_joined)
+
+      expect(first_row.text).to include(owner.name)
+      expect(second_row.text).to include(developer.name)
+      expect(page).to have_css(dropdown_toggle_selector, text: 'Oldest joined')
+    end
+
+    it 'sorts by name ascending' do
+      visit_members_list(sort: :name_asc)
+
+      expect(first_row.text).to include(owner.name)
+      expect(second_row.text).to include(developer.name)
+      expect(page).to have_css(dropdown_toggle_selector, text: 'Name, ascending')
+    end
+
+    it 'sorts by name descending' do
+      visit_members_list(sort: :name_desc)
+
+      expect(first_row.text).to include(developer.name)
+      expect(second_row.text).to include(owner.name)
+      expect(page).to have_css(dropdown_toggle_selector, text: 'Name, descending')
+    end
+
+    it 'sorts by recent sign in', :clean_gitlab_redis_shared_state do
+      visit_members_list(sort: :recent_sign_in)
+
+      expect(first_row.text).to include(owner.name)
+      expect(second_row.text).to include(developer.name)
+      expect(page).to have_css(dropdown_toggle_selector, text: 'Recent sign in')
+    end
+
+    it 'sorts by oldest sign in', :clean_gitlab_redis_shared_state do
+      visit_members_list(sort: :oldest_sign_in)
 
-    expect(first_row.text).to include(developer.name)
-    expect(second_row.text).to include(owner.name)
-    expect(page).to have_css(dropdown_toggle_selector, text: 'Oldest sign in')
+      expect(first_row.text).to include(developer.name)
+      expect(second_row.text).to include(owner.name)
+      expect(page).to have_css(dropdown_toggle_selector, text: 'Oldest sign in')
+    end
   end
 
   def visit_members_list(sort:)
diff --git a/spec/features/groups/members/tabs_spec.rb b/spec/features/groups/members/tabs_spec.rb
index fa77d1a2ff8..2f95e9fa6d3 100644
--- a/spec/features/groups/members/tabs_spec.rb
+++ b/spec/features/groups/members/tabs_spec.rb
@@ -62,9 +62,10 @@ RSpec.describe 'Groups > Members > Tabs' do
 
       click_link 'Invited'
 
-      page.within '[data-testid="user-search-form"]' do
-        fill_in 'search_invited', with: 'email'
-        find('button[type="submit"]').click
+      page.within '[data-testid="members-filtered-search-bar"]' do
+        find_field('Search invited').click
+        find('input').native.send_keys('email')
+        click_button 'Search'
       end
     end
 
@@ -74,9 +75,10 @@ RSpec.describe 'Groups > Members > Tabs' do
       before do
         click_link 'Members'
 
-        page.within '[data-testid="user-search-form"]' do
-          fill_in 'search', with: 'test'
-          find('button[type="submit"]').click
+        page.within '[data-testid="members-filtered-search-bar"]' do
+          find_field('Filter members').click
+          find('input').native.send_keys('test')
+          click_button 'Search'
         end
       end