diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-10-02 11:42:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-10-02 11:42:57 +0000 |
| commit | e64594ac4419a42b84f3ee36388f832e74361c8c (patch) | |
| tree | 13168c00d7e0b8dadb30d28318b803f92b9e30fe /spec/features/projects | |
| parent | 076e0406390cb03ade887723bceb3a6bb9613986 (diff) | |
| parent | 60790cac6b3a13e0b33f37d896146539fddcb7e6 (diff) | |
| download | gitlab-ce-e64594ac4419a42b84f3ee36388f832e74361c8c.tar.gz | |
Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-access' into 'master'
Resolve "`Member.add_user`doesn't detect existing members that have requested access"
## What does this MR do?
This merge request handle the case when an access requester is added to a group or project (via the members page or the API).
In `Member.add_user`, if an access requester already exists, we simply accept their request (and set the `created_by`, `access_level` and `expires_at` attributes if given).
## Are there points in the code the reviewer needs to double check?
I've taken the opportunity to cleanup the whole `{Group,Project}Member.add_user*` methods since it was quite a mess.
## What are the relevant issue numbers?
Closes #21983
See merge request !6393
Diffstat (limited to 'spec/features/projects')
| -rw-r--r-- | spec/features/projects/members/owner_cannot_leave_project_spec.rb | 4 | ||||
| -rw-r--r-- | spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/spec/features/projects/members/owner_cannot_leave_project_spec.rb b/spec/features/projects/members/owner_cannot_leave_project_spec.rb index 67811b1048e..6e948b7a616 100644 --- a/spec/features/projects/members/owner_cannot_leave_project_spec.rb +++ b/spec/features/projects/members/owner_cannot_leave_project_spec.rb @@ -1,12 +1,10 @@ require 'spec_helper' feature 'Projects > Members > Owner cannot leave project', feature: true do - let(:owner) { create(:user) } let(:project) { create(:project) } background do - project.team << [owner, :owner] - login_as(owner) + login_as(project.owner) visit namespace_project_path(project.namespace, project) end diff --git a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb index 0e54c4fdf20..4ca9272b9c1 100644 --- a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb +++ b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb @@ -1,12 +1,10 @@ require 'spec_helper' feature 'Projects > Members > Owner cannot request access to his project', feature: true do - let(:owner) { create(:user) } let(:project) { create(:project) } background do - project.team << [owner, :owner] - login_as(owner) + login_as(project.owner) visit namespace_project_path(project.namespace, project) end |