Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb
index 42197a6b103..03639bc0b98 100644
--- a/spec/finders/merge_requests_finder_spec.rb
+++ b/spec/finders/merge_requests_finder_spec.rb
@@ -681,6 +681,18 @@ RSpec.describe MergeRequestsFinder do
           expect(mrs).to eq([mr1])
         end
 
+        it 'filters merge requests ignoring empty deployed_before' do
+          mrs = described_class.new(user, deployed_before: '').execute
+
+          expect(mrs.size).to eq(7)
+        end
+
+        it 'filters merge requests ignoring invalid deployed_before' do
+          mrs = described_class.new(user, deployed_before: '2021-99-99').execute
+
+          expect(mrs.size).to eq(7)
+        end
+
         it 'filters merge requests deployed after a given date' do
           mrs = described_class
             .new(user, deployed_after: '2020-10-01 12:00')
@@ -688,6 +700,18 @@ RSpec.describe MergeRequestsFinder do
 
           expect(mrs).to eq([mr2])
         end
+
+        it 'filters merge requests ignoring empty deployed_after' do
+          mrs = described_class.new(user, deployed_after: '').execute
+
+          expect(mrs.size).to eq(7)
+        end
+
+        it 'filters merge requests ignoring invalid deployed_after' do
+          mrs = described_class.new(user, deployed_after: '2021-99-99').execute
+
+          expect(mrs.size).to eq(7)
+        end
       end
 
       it 'does not raise any exception with complex filters' do