Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 22 deletions

diff --git a/spec/workers/member_invitation_reminder_emails_worker_spec.rb b/spec/workers/member_invitation_reminder_emails_worker_spec.rb
index bfd08792c7c..bb4ff466584 100644
--- a/spec/workers/member_invitation_reminder_emails_worker_spec.rb
+++ b/spec/workers/member_invitation_reminder_emails_worker_spec.rb
@@ -10,30 +10,12 @@ RSpec.describe MemberInvitationReminderEmailsWorker do
       create(:group_member, :invited, created_at: 2.days.ago)
     end
 
-    context 'feature flag disabled' do
-      before do
-        stub_experiment(invitation_reminders: false)
+    it 'executes the invitation reminder email service' do
+      expect_next_instance_of(Members::InvitationReminderEmailService) do |service|
+        expect(service).to receive(:execute)
       end
 
-      it 'does not attempt to execute the invitation reminder service' do
-        expect(Members::InvitationReminderEmailService).not_to receive(:new)
-
-        subject
-      end
-    end
-
-    context 'feature flag enabled' do
-      before do
-        stub_experiment(invitation_reminders: true)
-      end
-
-      it 'executes the invitation reminder email service' do
-        expect_next_instance_of(Members::InvitationReminderEmailService) do |service|
-          expect(service).to receive(:execute)
-        end
-
-        subject
-      end
+      subject
     end
   end
 end