diff options
| author | John Jarvis <jarv@gitlab.com> | 2018-12-27 15:49:34 +0100 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2018-12-27 15:49:34 +0100 |
| commit | a8c4f7f121b85f3e755c8b65f14fe188b9dc5a03 (patch) | |
| tree | 79a619241db7f009e1f2c922d94be9e26d6182ab /spec/helpers | |
| parent | 6154ac9a841cff70ab9cf66adbf7543466b9e6cb (diff) | |
| parent | 943bc6705b7a58fc57c2bf03c22c69ef19252197 (diff) | |
| download | gitlab-ce-a8c4f7f121b85f3e755c8b65f14fe188b9dc5a03.tar.gz | |
Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stable
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/members_helper_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/helpers/members_helper_spec.rb b/spec/helpers/members_helper_spec.rb index 4590904c93d..908e8960f37 100644 --- a/spec/helpers/members_helper_spec.rb +++ b/spec/helpers/members_helper_spec.rb @@ -16,7 +16,7 @@ describe MembersHelper do it { expect(remove_member_message(project_member_invite)).to eq "Are you sure you want to revoke the invitation for #{project_member_invite.invite_email} to join the #{project.full_name} project?" } it { expect(remove_member_message(project_member_request)).to eq "Are you sure you want to deny #{requester.name}'s request to join the #{project.full_name} project?" } it { expect(remove_member_message(project_member_request, user: requester)).to eq "Are you sure you want to withdraw your access request for the #{project.full_name} project?" } - it { expect(remove_member_message(group_member)).to eq "Are you sure you want to remove #{group_member.user.name} from the #{group.name} group?" } + it { expect(remove_member_message(group_member)).to eq "Are you sure you want to remove #{group_member.user.name} from the #{group.name} group and any subresources?" } it { expect(remove_member_message(group_member_invite)).to eq "Are you sure you want to revoke the invitation for #{group_member_invite.invite_email} to join the #{group.name} group?" } it { expect(remove_member_message(group_member_request)).to eq "Are you sure you want to deny #{requester.name}'s request to join the #{group.name} group?" } it { expect(remove_member_message(group_member_request, user: requester)).to eq "Are you sure you want to withdraw your access request for the #{group.name} group?" } @@ -33,7 +33,7 @@ describe MembersHelper do it { expect(remove_member_title(project_member)).to eq 'Remove user from project' } it { expect(remove_member_title(project_member_request)).to eq 'Deny access request from project' } - it { expect(remove_member_title(group_member)).to eq 'Remove user from group' } + it { expect(remove_member_title(group_member)).to eq 'Remove user from group and any subresources' } it { expect(remove_member_title(group_member_request)).to eq 'Deny access request from group' } end |