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

1 files changed, 42 insertions, 1 deletions

diff --git a/spec/models/notification_setting_spec.rb b/spec/models/notification_setting_spec.rb
index 67738eaec20..0f765d6b09b 100644
--- a/spec/models/notification_setting_spec.rb
+++ b/spec/models/notification_setting_spec.rb
@@ -118,6 +118,46 @@ RSpec.describe NotificationSetting do
         expect(subject.event_enabled?(:foo_event)).to be(false)
       end
     end
+
+    describe 'for failed_pipeline' do
+      using RSpec::Parameterized::TableSyntax
+
+      where(:column, :expected) do
+        nil | true
+        true | true
+        false | false
+      end
+
+      with_them do
+        before do
+          subject.update!(failed_pipeline: column)
+        end
+
+        it do
+          expect(subject.event_enabled?(:failed_pipeline)).to eq(expected)
+        end
+      end
+    end
+
+    describe 'for fixed_pipeline' do
+      using RSpec::Parameterized::TableSyntax
+
+      where(:column, :expected) do
+        nil | true
+        true | true
+        false | false
+      end
+
+      with_them do
+        before do
+          subject.update!(fixed_pipeline: column)
+        end
+
+        it do
+          expect(subject.event_enabled?(:fixed_pipeline)).to eq(expected)
+        end
+      end
+    end
   end
 
   describe '.email_events' do
@@ -138,7 +178,8 @@ RSpec.describe NotificationSetting do
         :merge_merge_request,
         :failed_pipeline,
         :success_pipeline,
-        :fixed_pipeline
+        :fixed_pipeline,
+        :moved_project
       )
     end