Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 18 insertions, 10 deletions

diff --git a/spec/lib/gitlab/email/handler/create_note_handler_spec.rb b/spec/lib/gitlab/email/handler/create_note_handler_spec.rb
index 909a7618df4..af963e1b695 100644
--- a/spec/lib/gitlab/email/handler/create_note_handler_spec.rb
+++ b/spec/lib/gitlab/email/handler/create_note_handler_spec.rb
@@ -65,16 +65,24 @@ describe Gitlab::Email::Handler::CreateNoteHandler do
         end
       end
 
-      context 'and current user can update noteable' do
-        before do
-          project.add_developer(user)
-        end
-
-        it 'does not raise an error' do
-          # One system note is created for the 'close' event
-          expect { receiver.execute }.to change { noteable.notes.count }.by(1)
-
-          expect(noteable.reload).to be_closed
+      [true, false].each do |state_tracking_enabled|
+        context "and current user can update noteable #{state_tracking_enabled ? 'enabled' : 'disabled'}" do
+          before do
+            stub_feature_flags(track_resource_state_change_events: state_tracking_enabled)
+
+            project.add_developer(user)
+          end
+
+          it 'does not raise an error' do
+            if state_tracking_enabled
+              expect { receiver.execute }.to change { noteable.resource_state_events.count }.by(1)
+            else
+              # One system note is created for the 'close' event
+              expect { receiver.execute }.to change { noteable.notes.count }.by(1)
+            end
+
+            expect(noteable.reload).to be_closed
+          end
         end
       end
     end