From d2ffc30fd583e86d4122bb5061098f4f3ca7b3f1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Oct 2019 12:06:32 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/mailers/notify_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'spec/mailers') diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 56fa26d5f23..1991bac0229 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -714,7 +714,7 @@ describe Notify do describe 'project access requested' do let(:project) do - create(:project, :public, :access_requestable) do |project| + create(:project, :public) do |project| project.add_maintainer(project.owner) end end @@ -743,7 +743,7 @@ describe Notify do end describe 'project access denied' do - let(:project) { create(:project, :public, :access_requestable) } + let(:project) { create(:project, :public) } let(:project_member) do project.request_access(user) project.requesters.find_by(user_id: user.id) @@ -765,7 +765,7 @@ describe Notify do describe 'project access changed' do let(:owner) { create(:user, name: "Chang O'Keefe") } - let(:project) { create(:project, :public, :access_requestable, namespace: owner.namespace) } + let(:project) { create(:project, :public, namespace: owner.namespace) } let(:project_member) { create(:project_member, project: project, user: user) } subject { described_class.member_access_granted_email('project', project_member.id) } @@ -1167,7 +1167,7 @@ describe Notify do context 'for a group' do describe 'group access requested' do - let(:group) { create(:group, :public, :access_requestable) } + let(:group) { create(:group, :public) } let(:group_member) do group.request_access(user) group.requesters.find_by(user_id: user.id) -- cgit v1.2.1