Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 9 deletions

diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index bd6734634cb..70ce05927b4 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -1942,7 +1942,7 @@ describe NotificationService, :mailer do
         let(:developer) { create(:user) }
 
         let!(:group) do
-          create(:group, :public, :access_requestable) do |group|
+          create(:group, :public) do |group|
             group.add_owner(owner)
             group.add_maintainer(maintainer)
             group.add_developer(developer)
@@ -1968,7 +1968,7 @@ describe NotificationService, :mailer do
       end
 
       it_behaves_like 'sends notification only to a maximum of ten, most recently active group owners' do
-        let(:group) { create(:group, :public, :access_requestable) }
+        let(:group) { create(:group, :public) }
         let(:notification_trigger) { group.request_access(added_user) }
       end
     end
@@ -2029,7 +2029,7 @@ describe NotificationService, :mailer do
           let(:maintainer) { create(:user) }
 
           let!(:project) do
-            create(:project, :public, :access_requestable) do |project|
+            create(:project, :public) do |project|
               project.add_developer(developer)
               project.add_maintainer(maintainer)
             end
@@ -2053,7 +2053,7 @@ describe NotificationService, :mailer do
         end
 
         it_behaves_like 'sends notification only to a maximum of ten, most recently active project maintainers' do
-          let(:project) { create(:project, :public, :access_requestable) }
+          let(:project) { create(:project, :public) }
           let(:notification_trigger) { project.request_access(added_user) }
         end
       end
@@ -2064,7 +2064,7 @@ describe NotificationService, :mailer do
 
         context 'when the project has no maintainers' do
           context 'when the group has at least one owner' do
-            let!(:project) { create(:project, :public, :access_requestable, namespace: group) }
+            let!(:project) { create(:project, :public, namespace: group) }
 
             before do
               reset_delivered_emails!
@@ -2079,14 +2079,14 @@ describe NotificationService, :mailer do
             end
 
             it_behaves_like 'sends notification only to a maximum of ten, most recently active group owners' do
-              let(:group) { create(:group, :public, :access_requestable) }
+              let(:group) { create(:group, :public) }
               let(:notification_trigger) { project.request_access(added_user) }
             end
           end
 
           context 'when the group does not have any owners' do
             let(:group) { create(:group) }
-            let!(:project) { create(:project, :public, :access_requestable, namespace: group) }
+            let!(:project) { create(:project, :public, namespace: group) }
 
             context 'recipients' do
               before do
@@ -2107,7 +2107,7 @@ describe NotificationService, :mailer do
           let(:developer) { create(:user) }
 
           let!(:project) do
-            create(:project, :public, :access_requestable, namespace: group) do |project|
+            create(:project, :public, namespace: group) do |project|
               project.add_maintainer(maintainer)
               project.add_developer(developer)
             end
@@ -2128,7 +2128,7 @@ describe NotificationService, :mailer do
           end
 
           it_behaves_like 'sends notification only to a maximum of ten, most recently active project maintainers' do
-            let(:project) { create(:project, :public, :access_requestable, namespace: group) }
+            let(:project) { create(:project, :public, namespace: group) }
             let(:notification_trigger) { project.request_access(added_user) }
           end
         end