diff options
author | Robert Speicher <robert@gitlab.com> | 2018-09-09 19:59:04 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-09-09 19:59:04 +0000 |
commit | 3fe14f935ca7b68585c6df5458d2070bbff051f7 (patch) | |
tree | 88a382e21afe8a6e6944dd26f8fe777563cdb027 /spec | |
parent | a81775a0a07c0f4fb815d744b17efe00d7ea94c5 (diff) | |
parent | 9a10098e012505b540f64bfcedd6e4d93d5dd839 (diff) | |
download | gitlab-ce-3fe14f935ca7b68585c6df5458d2070bbff051f7.tar.gz |
Merge branch 'fix-invite-group-spec-ee' into 'master'
Update invite_group_spec to be consistent with EE
See merge request gitlab-org/gitlab-ce!21608
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/projects/members/invite_group_spec.rb | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/spec/features/projects/members/invite_group_spec.rb b/spec/features/projects/members/invite_group_spec.rb index 1ea4934cff1..0fb3eb20b5b 100644 --- a/spec/features/projects/members/invite_group_spec.rb +++ b/spec/features/projects/members/invite_group_spec.rb @@ -17,7 +17,6 @@ describe 'Project > Members > Invite group', :js do shared_examples 'the project cannot be shared with groups' do it 'the "Invite group" tab does not exist' do visit project_settings_members_path(project) - expect(page).to have_selector('#invite-member-tab') expect(page).not_to have_selector('#invite-group-tab') end end @@ -31,7 +30,7 @@ describe 'Project > Members > Invite group', :js do sign_in(maintainer) end - context 'when the group has "Invite group lock" disabled' do + context 'when the group has "Share with group lock" disabled' do it_behaves_like 'the project can be shared with groups' it 'the project can be shared with another group' do @@ -49,7 +48,7 @@ describe 'Project > Members > Invite group', :js do end end - context 'when the group has "Invite group lock" enabled' do + context 'when the group has "Share with group lock" enabled' do before do project.namespace.update_column(:share_with_group_lock, true) end @@ -69,12 +68,12 @@ describe 'Project > Members > Invite group', :js do sign_in(maintainer) end - context 'when the root_group has "Invite group lock" disabled' do - context 'when the subgroup has "Invite group lock" disabled' do + context 'when the root_group has "Share with group lock" disabled' do + context 'when the subgroup has "Share with group lock" disabled' do it_behaves_like 'the project can be shared with groups' end - context 'when the subgroup has "Invite group lock" enabled' do + context 'when the subgroup has "Share with group lock" enabled' do before do subgroup.update_column(:share_with_group_lock, true) end @@ -83,16 +82,16 @@ describe 'Project > Members > Invite group', :js do end end - context 'when the root_group has "Invite group lock" enabled' do + context 'when the root_group has "Share with group lock" enabled' do before do root_group.update_column(:share_with_group_lock, true) end - context 'when the subgroup has "Invite group lock" disabled (parent overridden)' do + context 'when the subgroup has "Share with group lock" disabled (parent overridden)' do it_behaves_like 'the project can be shared with groups' end - context 'when the subgroup has "Invite group lock" enabled' do + context 'when the subgroup has "Share with group lock" enabled' do before do subgroup.update_column(:share_with_group_lock, true) end |