summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-08 18:04:04 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-08 18:04:04 +0000
commitaa7e051357d230c17f9a900589eca59bd6d6fdb0 (patch)
tree2688a42f25d9f6890454b648e71fbded2dc6df1b /spec
parent7bd5b8c1c709163547ec865484b341211158ebf1 (diff)
parent59b0f3e5d487cdced3ea92d93d531bded44b1753 (diff)
downloadgitlab-ce-aa7e051357d230c17f9a900589eca59bd6d6fdb0.tar.gz
Merge branch 'ce#31853-projects-shared-groups' into 'master'
31853 Remove duplication for sharing projects with groups in project settings Closes #31853 See merge request !11951
Diffstat (limited to 'spec')
-rw-r--r--spec/features/projects/group_links_spec.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/spec/features/projects/group_links_spec.rb b/spec/features/projects/group_links_spec.rb
index 4e5682c8636..1b680a56492 100644
--- a/spec/features/projects/group_links_spec.rb
+++ b/spec/features/projects/group_links_spec.rb
@@ -16,15 +16,17 @@ 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
- 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
@@ -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