Merge remote-tracking branch 'upstream/master'

1 files changed, 12 insertions, 9 deletions

diff --git a/spec/features/projects/group_links_spec.rb b/spec/features/projects/group_links_spec.rb
index c969acc9140..5195d027a9f 100644
--- a/spec/features/projects/group_links_spec.rb
+++ b/spec/features/projects/group_links_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Project group links', :feature, :js do
+feature 'Project group links', :js do
   include Select2Helper
 
   let(:master) { create(:user) }
@@ -9,22 +9,24 @@ feature 'Project group links', :feature, :js do
 
   background do
     project.add_master(master)
-    login_as(master)
+    sign_in(master)
   end
 
   context 'setting an expiration date for a group link' do
     before do
-      visit namespace_project_settings_members_path(project.namespace, project)
+      visit project_settings_members_path(project)
+
+      click_on 'share-with-group-tab'
 
       select2 group.id, from: '#link_group_id'
       fill_in 'expires_at_groups', with: (Time.current + 4.5.days).strftime('%Y-%m-%d')
       page.find('body').click
-      click_on 'Share'
+      find('.btn-create').trigger('click')
     end
 
     it 'shows the expiration time with a warning class' do
-      page.within('.enabled-groups') do
-        expect(page).to have_content('expires in 4 days')
+      page.within('.project-members-groups') do
+        expect(page).to have_content('Expires in 4 days')
         expect(page).to have_selector('.text-warning')
       end
     end
@@ -40,9 +42,10 @@ feature 'Project group links', :feature, :js do
       another_group.add_master(master)
     end
 
-    it 'does not show ancestors' do
-      visit namespace_project_settings_members_path(project.namespace, project)
+    it 'does not show ancestors', :nested_groups do
+      visit project_settings_members_path(project)
 
+      click_on 'share-with-group-tab'
       click_link 'Search for a group'
 
       page.within '.select2-drop' do
@@ -58,7 +61,7 @@ feature 'Project group links', :feature, :js do
       group.add_owner(master)
       group_two.add_owner(master)
 
-      visit namespace_project_settings_members_path(project.namespace, project)
+      visit project_settings_members_path(project)
       execute_script 'GroupsSelect.PER_PAGE = 1;'
       open_select2 '#link_group_id'
     end