Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/services/projects/blame_service_spec.rb b/spec/services/projects/blame_service_spec.rb
index 54c4315d242..52b0ed3412d 100644
--- a/spec/services/projects/blame_service_spec.rb
+++ b/spec/services/projects/blame_service_spec.rb
@@ -54,6 +54,12 @@ RSpec.describe Projects::BlameService, :aggregate_failures do
         it { is_expected.to eq(1..2) }
       end
 
+      context 'when user disabled the pagination' do
+        let(:params) { super().merge(no_pagination: 1) }
+
+        it { is_expected.to be_nil }
+      end
+
       context 'when feature flag disabled' do
         before do
           stub_feature_flags(blame_page_pagination: false)
@@ -75,6 +81,12 @@ RSpec.describe Projects::BlameService, :aggregate_failures do
       expect(subject.total_count).to eq(4)
     end
 
+    context 'when user disabled the pagination' do
+      let(:params) { super().merge(no_pagination: 1) }
+
+      it { is_expected.to be_nil }
+    end
+
     context 'when feature flag disabled' do
       before do
         stub_feature_flags(blame_page_pagination: false)