diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 15:06:32 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 15:06:32 +0300 |
commit | d2ffc30fd583e86d4122bb5061098f4f3ca7b3f1 (patch) | |
tree | cb29c77a3ea49eb8ec732b0e644ed6cfad4770d9 /spec/services/members | |
parent | 914ea32e0efca21436220df2c10e1bfbe4ed3da9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/members')
-rw-r--r-- | spec/services/members/approve_access_request_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/services/members/request_access_service_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/services/members/approve_access_request_service_spec.rb b/spec/services/members/approve_access_request_service_spec.rb index f56c31e51f6..5bbceac3dd0 100644 --- a/spec/services/members/approve_access_request_service_spec.rb +++ b/spec/services/members/approve_access_request_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe Members::ApproveAccessRequestService do - let(:project) { create(:project, :public, :access_requestable) } - let(:group) { create(:group, :public, :access_requestable) } + let(:project) { create(:project, :public) } + let(:group) { create(:group, :public) } let(:current_user) { create(:user) } let(:access_requester_user) { create(:user) } let(:access_requester) { source.requesters.find_by!(user_id: access_requester_user.id) } diff --git a/spec/services/members/request_access_service_spec.rb b/spec/services/members/request_access_service_spec.rb index 2e5275eb3f2..a0f7ae91bdb 100644 --- a/spec/services/members/request_access_service_spec.rb +++ b/spec/services/members/request_access_service_spec.rb @@ -41,7 +41,7 @@ describe Members::RequestAccessService do context 'when access requests are disabled' do %i[project group].each do |source_type| it_behaves_like 'a service raising Gitlab::Access::AccessDeniedError' do - let(:source) { create(source_type, :public) } + let(:source) { create(source_type, :public, :request_access_disabled) } end end end @@ -49,7 +49,7 @@ describe Members::RequestAccessService do context 'when current user can request access to the project' do %i[project group].each do |source_type| it_behaves_like 'a service creating a access request' do - let(:source) { create(source_type, :public, :access_requestable) } + let(:source) { create(source_type, :public) } end end end |