fixes project_group_links spec by adding click tab event

5 files changed, 12 insertions, 7 deletions

diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index 5c81de87f69..4be0e133b69 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -13,6 +13,7 @@
     &.active {
       background: $white-light;
     }
+
     &:first-child {
       border-right: 1px solid $border-color;
     }
diff --git a/app/views/projects/project_members/_index.html.haml b/app/views/projects/project_members/_index.html.haml
index 1a595a94eab..cfae371e169 100644
--- a/app/views/projects/project_members/_index.html.haml
+++ b/app/views/projects/project_members/_index.html.haml
@@ -18,10 +18,10 @@
       - if can?(current_user, :admin_project_member, @project)
         %ul.nav-links.project-member-tabs{ role: 'tablist' }
           %li.active{ role: 'presentation' }
-            %a{ href: '#add-member-pane', data: { toggle: 'tab' }, role: 'tab' } Add member
+            %a{ href: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' } Add member
           - if @project.allowed_to_share_with_group?
             %li{ role: 'presentation' }
-              %a{ href: '#share-with-group-pane', data: { toggle: 'tab' }, role: 'tab' } Share with group
+              %a{ href: '#share-with-group-pane', id: 'share-with-group-tab', data: { toggle: 'tab' }, role: 'tab' } Share with group
 
         .tab-content.project-member-tab-content
           .tab-pane.active{ id: 'add-member-pane', role: 'tabpanel' }
diff --git a/app/views/projects/project_members/_new_shared_group.html.haml b/app/views/projects/project_members/_new_shared_group.html.haml
index a9637afad65..b7cc8dd7062 100644
--- a/app/views/projects/project_members/_new_shared_group.html.haml
+++ b/app/views/projects/project_members/_new_shared_group.html.haml
@@ -17,4 +17,4 @@
         .clearable-input
           = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date-groups', placeholder: 'Expiration date', id: 'expires_at_groups'
           %i.clear-icon.js-clear-input
-      = submit_tag "Share", class: "btn btn-create"
\ No newline at end of file
+      = submit_tag "Share", class: "btn btn-create"
diff --git a/features/steps/project/project_group_links.rb b/features/steps/project/project_group_links.rb
index 739a85e5fa4..5280a38ce81 100644
--- a/features/steps/project/project_group_links.rb
+++ b/features/steps/project/project_group_links.rb
@@ -5,18 +5,19 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps
   include Select2Helper
 
   step 'I should see project already shared with group "Ops"' do
-    page.within '.enabled-groups' do
+    page.within '.project-members-groups' do
       expect(page).to have_content "Ops"
     end
   end
 
   step 'I should see project is not shared with group "Market"' do
-    page.within '.enabled-groups' do
+    page.within '.project-members-groups' do
       expect(page).not_to have_content "Market"
     end
   end
 
   step 'I select group "Market" for share' do
+    click_link 'Share with group'
     group = Group.find_by(path: 'market')
     select2(group.id, from: "#link_group_id")
     select "Master", from: 'link_group_access'
@@ -24,7 +25,7 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps
   end
 
   step 'I should see project is shared with group "Market"' do
-    page.within '.enabled-groups' do
+    page.within '.project-members-groups' do
       expect(page).to have_content "Market"
     end
   end
diff --git a/spec/features/projects/group_links_spec.rb b/spec/features/projects/group_links_spec.rb
index 4e5682c8636..1a27ca3002a 100644
--- a/spec/features/projects/group_links_spec.rb
+++ b/spec/features/projects/group_links_spec.rb
@@ -16,6 +16,8 @@ feature 'Project group links', :feature, :js do
     before do
       visit namespace_project_settings_members_path(project.namespace, 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
@@ -23,7 +25,7 @@ feature 'Project group links', :feature, :js do
     end
 
     it 'shows the expiration time with a warning class' do
-      page.within('.enabled-groups') do
+      page.within('.project-members-groups') do
         expect(page).to have_content('expires in 4 days')
         expect(page).to have_selector('.text-warning')
       end
@@ -43,6 +45,7 @@ feature 'Project group links', :feature, :js do
     it 'does not show ancestors', :nested_groups do
       visit namespace_project_settings_members_path(project.namespace, project)
 
+      click_on 'share-with-group-tab'
       click_link 'Search for a group'
 
       page.within '.select2-drop' do