Add latest changes from gitlab-org/gitlab@master

2 files changed, 27 insertions, 46 deletions

diff --git a/spec/lib/gitlab/pagination/offset_pagination_spec.rb b/spec/lib/gitlab/pagination/offset_pagination_spec.rb
index ffecbb06ff8..f8d50fbc517 100644
--- a/spec/lib/gitlab/pagination/offset_pagination_spec.rb
+++ b/spec/lib/gitlab/pagination/offset_pagination_spec.rb
@@ -82,7 +82,7 @@ RSpec.describe Gitlab::Pagination::OffsetPagination do
 
         context 'when the api_kaminari_count_with_limit feature flag is enabled' do
           before do
-            stub_feature_flags(api_kaminari_count_with_limit: true, lower_relation_max_count_limit: false)
+            stub_feature_flags(api_kaminari_count_with_limit: true)
           end
 
           context 'when resources count is less than MAX_COUNT_LIMIT' do
@@ -120,41 +120,6 @@ RSpec.describe Gitlab::Pagination::OffsetPagination do
             end
           end
 
-          context 'when lower_relation_max_count_limit FF is enabled' do
-            before do
-              stub_feature_flags(lower_relation_max_count_limit: true)
-            end
-
-            it_behaves_like 'paginated response'
-            it_behaves_like 'response with pagination headers'
-
-            context 'when limit is met' do
-              before do
-                stub_const("::Kaminari::ActiveRecordRelationMethods::MAX_COUNT_NEW_LOWER_LIMIT", 2)
-              end
-
-              it_behaves_like 'paginated response'
-
-              it 'does not return the X-Total and X-Total-Pages headers' do
-                expect_no_header('X-Total')
-                expect_no_header('X-Total-Pages')
-                expect_header('X-Per-Page', '2')
-                expect_header('X-Page', '1')
-                expect_header('X-Next-Page', '2')
-                expect_header('X-Prev-Page', '')
-
-                expect_header('Link', anything) do |_key, val|
-                  expect(val).to include(%Q(<#{incoming_api_projects_url}?#{query.merge(page: 1).to_query}>; rel="first"))
-                  expect(val).to include(%Q(<#{incoming_api_projects_url}?#{query.merge(page: 2).to_query}>; rel="next"))
-                  expect(val).not_to include('rel="last"')
-                  expect(val).not_to include('rel="prev"')
-                end
-
-                subject.paginate(resource)
-              end
-            end
-          end
-
           it 'does not return the total headers when excluding them' do
             expect_no_header('X-Total')
             expect_no_header('X-Total-Pages')
diff --git a/spec/lib/gitlab/redis/multi_store_spec.rb b/spec/lib/gitlab/redis/multi_store_spec.rb
index 0c8396cc90b..76731bb916c 100644
--- a/spec/lib/gitlab/redis/multi_store_spec.rb
+++ b/spec/lib/gitlab/redis/multi_store_spec.rb
@@ -478,9 +478,7 @@ RSpec.describe Gitlab::Redis::MultiStore do
 
     let_it_be(:key) { "redis:counter" }
 
-    subject do
-      multi_store.incr(key)
-    end
+    subject { multi_store.incr(key) }
 
     it 'executes method missing' do
       expect(multi_store).to receive(:method_missing)
@@ -488,17 +486,35 @@ RSpec.describe Gitlab::Redis::MultiStore do
       subject
     end
 
-    it 'logs MethodMissingError' do
-      expect(Gitlab::ErrorTracking).to receive(:log_exception).with(an_instance_of(Gitlab::Redis::MultiStore::MethodMissingError),
-        hash_including(command_name: :incr, extra: hash_including(instance_name: instance_name)))
+    context 'when command is not in SKIP_LOG_METHOD_MISSING_FOR_COMMANDS' do
+      it 'logs MethodMissingError' do
+        expect(Gitlab::ErrorTracking).to receive(:log_exception).with(an_instance_of(Gitlab::Redis::MultiStore::MethodMissingError),
+          hash_including(command_name: :incr, extra: hash_including(instance_name: instance_name)))
 
-      subject
+        subject
+      end
+
+      it 'increments method missing counter' do
+        expect(counter).to receive(:increment).with(command: :incr, instance_name: instance_name)
+
+        subject
+      end
     end
 
-    it 'increments method missing counter' do
-      expect(counter).to receive(:increment).with(command: :incr, instance_name: instance_name)
+    context 'when command is in SKIP_LOG_METHOD_MISSING_FOR_COMMANDS' do
+      subject { multi_store.info }
 
-      subject
+      it 'does not log MethodMissingError' do
+        expect(Gitlab::ErrorTracking).not_to receive(:log_exception)
+
+        subject
+      end
+
+      it 'does not increment method missing counter' do
+        expect(counter).not_to receive(:increment)
+
+        subject
+      end
     end
 
     context 'with feature flag :use_primary_store_as_default_for_test_store is enabled' do