Add latest changes from gitlab-org/gitlab@master

12 files changed, 223 insertions, 211 deletions

diff --git a/spec/lib/gitlab/project_search_results_spec.rb b/spec/lib/gitlab/project_search_results_spec.rb
index a9c0262fdb2..a762fdbde6b 100644
--- a/spec/lib/gitlab/project_search_results_spec.rb
+++ b/spec/lib/gitlab/project_search_results_spec.rb
@@ -118,7 +118,7 @@ RSpec.describe Gitlab::ProjectSearchResults do
   shared_examples 'blob search repository ref' do |entity_type, blob_type|
     let(:query) { 'files' }
     let(:file_finder) { double }
-    let(:project_branch) { 'project_branch' }
+    let(:project_branch) { blob_type == 'wiki_blobs' ? entity.default_branch : 'project_branch' }
 
     subject(:objects) { results.objects(blob_type) }
 
@@ -209,8 +209,11 @@ RSpec.describe Gitlab::ProjectSearchResults do
 
   describe 'wiki search' do
     let(:project) { create(:project, :public, :wiki_repo) }
+    let(:project_branch) { 'project_branch' }
 
     before do
+      allow(project.wiki).to receive(:root_ref).and_return(project_branch)
+
       project.wiki.create_page('Files/Title', 'Content')
       project.wiki.create_page('CHANGELOG', 'Files example')
     end
diff --git a/spec/lib/gitlab/serializer/ci/variables_spec.rb b/spec/lib/gitlab/serializer/ci/variables_spec.rb
index 9b0475259fe..02f1d543e4b 100644
--- a/spec/lib/gitlab/serializer/ci/variables_spec.rb
+++ b/spec/lib/gitlab/serializer/ci/variables_spec.rb
@@ -13,9 +13,10 @@ RSpec.describe Gitlab::Serializer::Ci::Variables do
   end
 
   it 'converts keys into strings and symbolizes hash' do
-    is_expected.to eq([
-      { key: 'key', value: 'value', public: true },
-      { key: 'wee', value: 1, public: false }
-    ])
+    is_expected.to eq(
+      [
+        { key: 'key', value: 'value', public: true },
+        { key: 'wee', value: 1, public: false }
+      ])
   end
 end
diff --git a/spec/lib/gitlab/sidekiq_config_spec.rb b/spec/lib/gitlab/sidekiq_config_spec.rb
index c62302d8bba..c5b00afe672 100644
--- a/spec/lib/gitlab/sidekiq_config_spec.rb
+++ b/spec/lib/gitlab/sidekiq_config_spec.rb
@@ -193,9 +193,7 @@ RSpec.describe Gitlab::SidekiqConfig do
     it 'returns worker queue mappings that have queues in the current Sidekiq options' do
       queues = described_class.routing_queues
 
-      expect(queues).to match_array(%w[
-        default mailers high_urgency gitaly
-      ])
+      expect(queues).to match_array(%w[default mailers high_urgency gitaly])
       expect(queues).not_to include('not_exist')
     end
   end
diff --git a/spec/lib/gitlab/ssh_public_key_spec.rb b/spec/lib/gitlab/ssh_public_key_spec.rb
index 114a18cf99a..a2524314458 100644
--- a/spec/lib/gitlab/ssh_public_key_spec.rb
+++ b/spec/lib/gitlab/ssh_public_key_spec.rb
@@ -88,12 +88,12 @@ RSpec.describe Gitlab::SSHPublicKey, lib: true, fips_mode: false do
     it 'returns all supported algorithms' do
       expect(described_class.supported_algorithms).to eq(
         %w(
-        ssh-rsa
-        ssh-dss
-        ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521
-        ssh-ed25519
-        sk-ecdsa-sha2-nistp256@openssh.com
-        sk-ssh-ed25519@openssh.com
+          ssh-rsa
+          ssh-dss
+          ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521
+          ssh-ed25519
+          sk-ecdsa-sha2-nistp256@openssh.com
+          sk-ssh-ed25519@openssh.com
         )
       )
     end
@@ -102,12 +102,12 @@ RSpec.describe Gitlab::SSHPublicKey, lib: true, fips_mode: false do
       it 'returns all supported algorithms' do
         expect(described_class.supported_algorithms).to eq(
           %w(
-          ssh-rsa
-          ssh-dss
-          ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521
-          ssh-ed25519
-          sk-ecdsa-sha2-nistp256@openssh.com
-          sk-ssh-ed25519@openssh.com
+            ssh-rsa
+            ssh-dss
+            ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521
+            ssh-ed25519
+            sk-ecdsa-sha2-nistp256@openssh.com
+            sk-ssh-ed25519@openssh.com
           )
         )
       end
diff --git a/spec/lib/gitlab/usage_data/topology_spec.rb b/spec/lib/gitlab/usage_data/topology_spec.rb
index dfdf8eaabe8..3fb87e77457 100644
--- a/spec/lib/gitlab/usage_data/topology_spec.rb
+++ b/spec/lib/gitlab/usage_data/topology_spec.rb
@@ -523,210 +523,210 @@ RSpec.describe Gitlab::UsageData::Topology do
     receive(:query)
       .with(/gitlab_usage_ping:ops:rate/)
       .and_return(result || [
-        {
-          'metric' => { 'component' => 'http_requests', 'service' => 'workhorse' },
-          'value' => [1000, '0.01']
-        }
-      ])
+                    {
+                      'metric' => { 'component' => 'http_requests', 'service' => 'workhorse' },
+                      'value' => [1000, '0.01']
+                    }
+                  ])
   end
 
   def receive_query_apdex_ratio_query(result: nil)
     receive(:query)
       .with(/gitlab_usage_ping:sql_duration_apdex:ratio_rate5m/)
       .and_return(result || [
-        {
-          'metric' => {},
-          'value' => [1000, '0.996']
-        }
-      ])
+                    {
+                      'metric' => {},
+                      'value' => [1000, '0.996']
+                    }
+                  ])
   end
 
   def receive_node_memory_query(result: nil)
     receive(:query)
       .with(/node_memory_total_bytes/, an_instance_of(Hash))
       .and_return(result || [
-        {
-          'metric' => { 'instance' => 'instance1:8080' },
-          'value' => [1000, '512']
-        },
-        {
-          'metric' => { 'instance' => 'instance2:8090' },
-          'value' => [1000, '1024']
-        }
-      ])
+                    {
+                      'metric' => { 'instance' => 'instance1:8080' },
+                      'value' => [1000, '512']
+                    },
+                    {
+                      'metric' => { 'instance' => 'instance2:8090' },
+                      'value' => [1000, '1024']
+                    }
+                  ])
   end
 
   def receive_node_memory_utilization_query(result: nil)
     receive(:query)
       .with(/node_memory_utilization/, an_instance_of(Hash))
       .and_return(result || [
-        {
-          'metric' => { 'instance' => 'instance1:8080' },
-          'value' => [1000, '0.45']
-        },
-        {
-          'metric' => { 'instance' => 'instance2:8090' },
-          'value' => [1000, '0.25']
-        }
-      ])
+                    {
+                      'metric' => { 'instance' => 'instance1:8080' },
+                      'value' => [1000, '0.45']
+                    },
+                    {
+                      'metric' => { 'instance' => 'instance2:8090' },
+                      'value' => [1000, '0.25']
+                    }
+                  ])
   end
 
   def receive_node_cpu_count_query(result: nil)
     receive(:query)
       .with(/node_cpus/, an_instance_of(Hash))
       .and_return(result || [
-        {
-          'metric' => { 'instance' => 'instance2:8090' },
-          'value' => [1000, '16']
-        },
-        {
-          'metric' => { 'instance' => 'instance1:8080' },
-          'value' => [1000, '8']
-        }
-      ])
+                    {
+                      'metric' => { 'instance' => 'instance2:8090' },
+                      'value' => [1000, '16']
+                    },
+                    {
+                      'metric' => { 'instance' => 'instance1:8080' },
+                      'value' => [1000, '8']
+                    }
+                  ])
   end
 
   def receive_node_cpu_utilization_query(result: nil)
     receive(:query)
       .with(/node_cpu_utilization/, an_instance_of(Hash))
       .and_return(result || [
-        {
-          'metric' => { 'instance' => 'instance2:8090' },
-          'value' => [1000, '0.2']
-        },
-        {
-          'metric' => { 'instance' => 'instance1:8080' },
-          'value' => [1000, '0.1']
-        }
-      ])
+                    {
+                      'metric' => { 'instance' => 'instance2:8090' },
+                      'value' => [1000, '0.2']
+                    },
+                    {
+                      'metric' => { 'instance' => 'instance1:8080' },
+                      'value' => [1000, '0.1']
+                    }
+                  ])
   end
 
   def receive_node_uname_info_query(result: nil)
     receive(:query)
       .with('node_uname_info')
       .and_return(result || [
-        {
-          "metric" => {
-            "__name__" => "node_uname_info",
-            "domainname" => "(none)",
-            "instance" => "instance1:9100",
-            "job" => "node_exporter",
-            "machine" => "x86_64",
-            "nodename" => "instance1",
-            "release" => "4.19.76-linuxkit",
-            "sysname" => "Linux"
-          },
-          "value" => [1592463033.359, "1"]
-        },
-        {
-          "metric" => {
-            "__name__" => "node_uname_info",
-            "domainname" => "(none)",
-            "instance" => "instance2:9100",
-            "job" => "node_exporter",
-            "machine" => "x86_64",
-            "nodename" => "instance2",
-            "release" => "4.15.0-101-generic",
-            "sysname" => "Linux"
-          },
-          "value" => [1592463033.359, "1"]
-        }
-      ])
+                    {
+                      "metric" => {
+                        "__name__" => "node_uname_info",
+                        "domainname" => "(none)",
+                        "instance" => "instance1:9100",
+                        "job" => "node_exporter",
+                        "machine" => "x86_64",
+                        "nodename" => "instance1",
+                        "release" => "4.19.76-linuxkit",
+                        "sysname" => "Linux"
+                      },
+                      "value" => [1592463033.359, "1"]
+                    },
+                    {
+                      "metric" => {
+                        "__name__" => "node_uname_info",
+                        "domainname" => "(none)",
+                        "instance" => "instance2:9100",
+                        "job" => "node_exporter",
+                        "machine" => "x86_64",
+                        "nodename" => "instance2",
+                        "release" => "4.15.0-101-generic",
+                        "sysname" => "Linux"
+                      },
+                      "value" => [1592463033.359, "1"]
+                    }
+                  ])
   end
 
   def receive_node_service_memory_rss_query(result: nil)
     receive(:query)
       .with(/process_resident_memory_bytes/, an_instance_of(Hash))
       .and_return(result || [
-        {
-          'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails' },
-          'value' => [1000, '300']
-        },
-        {
-          'metric' => { 'instance' => 'instance1:8090', 'job' => 'gitlab-sidekiq' },
-          'value' => [1000, '303']
-        },
-        # instance 2: runs a dedicated Sidekiq + Redis (which uses a different metric name)
-        {
-          'metric' => { 'instance' => 'instance2:8090', 'job' => 'gitlab-sidekiq' },
-          'value' => [1000, '400']
-        },
-        {
-          'metric' => { 'instance' => 'instance2:9121', 'job' => 'redis' },
-          'value' => [1000, '402']
-        }
-      ])
+                    {
+                      'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails' },
+                      'value' => [1000, '300']
+                    },
+                    {
+                      'metric' => { 'instance' => 'instance1:8090', 'job' => 'gitlab-sidekiq' },
+                      'value' => [1000, '303']
+                    },
+                    # instance 2: runs a dedicated Sidekiq + Redis (which uses a different metric name)
+                    {
+                      'metric' => { 'instance' => 'instance2:8090', 'job' => 'gitlab-sidekiq' },
+                      'value' => [1000, '400']
+                    },
+                    {
+                      'metric' => { 'instance' => 'instance2:9121', 'job' => 'redis' },
+                      'value' => [1000, '402']
+                    }
+                  ])
   end
 
   def receive_node_service_memory_uss_query(result: nil)
     receive(:query)
       .with(/process_unique_memory_bytes/, an_instance_of(Hash))
       .and_return(result || [
-        {
-          'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails' },
-          'value' => [1000, '301']
-        }
-      ])
+                    {
+                      'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails' },
+                      'value' => [1000, '301']
+                    }
+                  ])
   end
 
   def receive_node_service_memory_pss_query(result: nil)
     receive(:query)
       .with(/process_proportional_memory_bytes/, an_instance_of(Hash))
       .and_return(result || [
-        {
-          'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails' },
-          'value' => [1000, '302']
-        },
-        {
-          'metric' => { 'instance' => 'instance2:8090', 'job' => 'gitlab-sidekiq' },
-          'value' => [1000, '401']
-        }
-      ])
+                    {
+                      'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails' },
+                      'value' => [1000, '302']
+                    },
+                    {
+                      'metric' => { 'instance' => 'instance2:8090', 'job' => 'gitlab-sidekiq' },
+                      'value' => [1000, '401']
+                    }
+                  ])
   end
 
   def receive_node_service_process_count_query(result: nil)
     receive(:query)
       .with(/service_process:count/, an_instance_of(Hash))
       .and_return(result || [
-        # instance 1
-        {
-          'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails' },
-          'value' => [1000, '10']
-        },
-        {
-          'metric' => { 'instance' => 'instance1:8090', 'job' => 'gitlab-sidekiq' },
-          'value' => [1000, '5']
-        },
-        # instance 2
-        {
-          'metric' => { 'instance' => 'instance2:8090', 'job' => 'gitlab-sidekiq' },
-          'value' => [1000, '15']
-        },
-        {
-          'metric' => { 'instance' => 'instance2:9121', 'job' => 'redis' },
-          'value' => [1000, '1']
-        },
-        {
-          'metric' => { 'instance' => 'instance2:8080', 'job' => 'registry' },
-          'value' => [1000, '1']
-        }
-      ])
+                    # instance 1
+                    {
+                      'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails' },
+                      'value' => [1000, '10']
+                    },
+                    {
+                      'metric' => { 'instance' => 'instance1:8090', 'job' => 'gitlab-sidekiq' },
+                      'value' => [1000, '5']
+                    },
+                    # instance 2
+                    {
+                      'metric' => { 'instance' => 'instance2:8090', 'job' => 'gitlab-sidekiq' },
+                      'value' => [1000, '15']
+                    },
+                    {
+                      'metric' => { 'instance' => 'instance2:9121', 'job' => 'redis' },
+                      'value' => [1000, '1']
+                    },
+                    {
+                      'metric' => { 'instance' => 'instance2:8080', 'job' => 'registry' },
+                      'value' => [1000, '1']
+                    }
+                  ])
   end
 
   def receive_node_service_app_server_workers_query(result: nil)
     receive(:query)
       .with(/app_server_workers/, an_instance_of(Hash))
       .and_return(result || [
-        # instance 1
-        {
-          'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails', 'server' => 'puma' },
-          'value' => [1000, '2']
-        },
-        # instance 2
-        {
-          'metric' => { 'instance' => 'instance2:8080', 'job' => 'gitlab-rails', 'server' => 'puma' },
-          'value' => [1000, '1']
-        }
-      ])
+                    # instance 1
+                    {
+                      'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails', 'server' => 'puma' },
+                      'value' => [1000, '2']
+                    },
+                    # instance 2
+                    {
+                      'metric' => { 'instance' => 'instance2:8080', 'job' => 'gitlab-rails', 'server' => 'puma' },
+                      'value' => [1000, '1']
+                    }
+                  ])
   end
 end
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 745aa20a6a2..dc34b0b10e0 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -1050,12 +1050,13 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
 
       before do
         allow(described_class).to receive(:operating_system).and_return('ubuntu-20.04')
-        expect(prometheus_client).to receive(:query).with(/gitlab_usage_ping:gitaly_apdex:ratio_avg_over_time_5m/).and_return([
-          {
-            'metric' => {},
-            'value' => [1616016381.473, '0.95']
-          }
-        ])
+        expect(prometheus_client).to receive(:query)
+          .with(/gitlab_usage_ping:gitaly_apdex:ratio_avg_over_time_5m/)
+          .and_return(
+            [
+              { 'metric' => {},
+                'value' => [1616016381.473, '0.95'] }
+            ])
         expect(described_class).to receive(:with_prometheus_client).and_yield(prometheus_client)
       end
 
diff --git a/spec/lib/gitlab/utils_spec.rb b/spec/lib/gitlab/utils_spec.rb
index 61323f0646b..d1fdaf7a9db 100644
--- a/spec/lib/gitlab/utils_spec.rb
+++ b/spec/lib/gitlab/utils_spec.rb
@@ -582,11 +582,12 @@ RSpec.describe Gitlab::Utils do
       end
 
       it 'sorts items like the regular sort_by' do
-        expect(sorted_list).to eq([
-          { name: 'obj 2', priority: 1 },
-          { name: 'obj 1', priority: 2 },
-          { name: 'obj 3', priority: 3 }
-        ])
+        expect(sorted_list).to eq(
+          [
+            { name: 'obj 2', priority: 1 },
+            { name: 'obj 1', priority: 2 },
+            { name: 'obj 3', priority: 3 }
+          ])
       end
     end
   end
diff --git a/spec/lib/gitlab/webpack/manifest_spec.rb b/spec/lib/gitlab/webpack/manifest_spec.rb
index 08b4774dd67..24a36258379 100644
--- a/spec/lib/gitlab/webpack/manifest_spec.rb
+++ b/spec/lib/gitlab/webpack/manifest_spec.rb
@@ -66,10 +66,11 @@ RSpec.describe Gitlab::Webpack::Manifest do
       describe "webpack errors" do
         context "when webpack has 'Module build failed' errors in its manifest" do
           it "errors" do
-            error_manifest = Gitlab::Json.parse(manifest).merge("errors" => [
-              "somethingModule build failed something",
-              "I am an error"
-            ]).to_json
+            error_manifest = Gitlab::Json.parse(manifest).merge("errors" =>
+              [
+                "somethingModule build failed something",
+                "I am an error"
+              ]).to_json
             stub_request(:get, "http://hostname:2000/public_path/my_manifest.json").to_return(body: error_manifest, status: 200)
 
             expect { Gitlab::Webpack::Manifest.asset_paths("entry1") }.to raise_error(Gitlab::Webpack::Manifest::WebpackError)
diff --git a/spec/lib/google_api/cloud_platform/client_spec.rb b/spec/lib/google_api/cloud_platform/client_spec.rb
index 0f117f495d1..0c207161927 100644
--- a/spec/lib/google_api/cloud_platform/client_spec.rb
+++ b/spec/lib/google_api/cloud_platform/client_spec.rb
@@ -17,17 +17,19 @@ RSpec.describe GoogleApi::CloudPlatform::Client do
   let(:tier) { 'mock-tier' }
 
   let(:database_list) do
-    Google::Apis::SqladminV1beta4::ListDatabasesResponse.new(items: [
-      Google::Apis::SqladminV1beta4::Database.new(name: 'db_01', instance: database_instance),
-      Google::Apis::SqladminV1beta4::Database.new(name: 'db_02', instance: database_instance)
-    ])
+    Google::Apis::SqladminV1beta4::ListDatabasesResponse.new(
+      items: [
+        Google::Apis::SqladminV1beta4::Database.new(name: 'db_01', instance: database_instance),
+        Google::Apis::SqladminV1beta4::Database.new(name: 'db_02', instance: database_instance)
+      ])
   end
 
   let(:user_list) do
-    Google::Apis::SqladminV1beta4::ListUsersResponse.new(items: [
-      Google::Apis::SqladminV1beta4::User.new(name: 'user_01', instance: database_instance),
-      Google::Apis::SqladminV1beta4::User.new(name: 'user_02', instance: database_instance)
-    ])
+    Google::Apis::SqladminV1beta4::ListUsersResponse.new(
+      items: [
+        Google::Apis::SqladminV1beta4::User.new(name: 'user_01', instance: database_instance),
+        Google::Apis::SqladminV1beta4::User.new(name: 'user_02', instance: database_instance)
+      ])
   end
 
   describe '.session_key_for_redirect_uri' do
diff --git a/spec/lib/peek/views/bullet_detailed_spec.rb b/spec/lib/peek/views/bullet_detailed_spec.rb
index ec2f798a320..6eaf8c50cc0 100644
--- a/spec/lib/peek/views/bullet_detailed_spec.rb
+++ b/spec/lib/peek/views/bullet_detailed_spec.rb
@@ -44,10 +44,11 @@ RSpec.describe Peek::Views::BulletDetailed do
         expect(subject.key).to eq('bullet')
         expect(subject.results[:calls]).to eq(2)
         expect(subject.results[:warnings]).to eq([Peek::Views::BulletDetailed::WARNING_MESSAGE])
-        expect(subject.results[:details]).to eq([
-          { notification: 'Title 1: Body 1', backtrace: "first\nsecond\n" },
-          { notification: 'Title 2: Body 2', backtrace: "first\nsecond\n" }
-        ])
+        expect(subject.results[:details]).to eq(
+          [
+            { notification: 'Title 1: Body 1', backtrace: "first\nsecond\n" },
+            { notification: 'Title 2: Body 2', backtrace: "first\nsecond\n" }
+          ])
       end
     end
   end
diff --git a/spec/lib/system_check/incoming_email_check_spec.rb b/spec/lib/system_check/incoming_email_check_spec.rb
index 5d93b810045..cf3fd3b7967 100644
--- a/spec/lib/system_check/incoming_email_check_spec.rb
+++ b/spec/lib/system_check/incoming_email_check_spec.rb
@@ -26,11 +26,12 @@ RSpec.describe SystemCheck::IncomingEmailCheck do
       end
 
       it 'runs IMAP and mailroom checks' do
-        expect(SystemCheck).to receive(:run).with('Reply by email', [
-          SystemCheck::IncomingEmail::ImapAuthenticationCheck,
-          SystemCheck::IncomingEmail::MailRoomEnabledCheck,
-          SystemCheck::IncomingEmail::MailRoomRunningCheck
-        ])
+        expect(SystemCheck).to receive(:run).with('Reply by email',
+          [
+            SystemCheck::IncomingEmail::ImapAuthenticationCheck,
+            SystemCheck::IncomingEmail::MailRoomEnabledCheck,
+            SystemCheck::IncomingEmail::MailRoomRunningCheck
+          ])
 
         subject.multi_check
       end
@@ -42,10 +43,11 @@ RSpec.describe SystemCheck::IncomingEmailCheck do
       end
 
       it 'runs mailroom checks' do
-        expect(SystemCheck).to receive(:run).with('Reply by email', [
-          SystemCheck::IncomingEmail::MailRoomEnabledCheck,
-          SystemCheck::IncomingEmail::MailRoomRunningCheck
-        ])
+        expect(SystemCheck).to receive(:run).with('Reply by email',
+          [
+            SystemCheck::IncomingEmail::MailRoomEnabledCheck,
+            SystemCheck::IncomingEmail::MailRoomRunningCheck
+          ])
 
         subject.multi_check
       end
diff --git a/spec/lib/unnested_in_filters/rewriter_spec.rb b/spec/lib/unnested_in_filters/rewriter_spec.rb
index a808aec7728..21bab42c95c 100644
--- a/spec/lib/unnested_in_filters/rewriter_spec.rb
+++ b/spec/lib/unnested_in_filters/rewriter_spec.rb
@@ -41,14 +41,15 @@ RSpec.describe UnnestedInFilters::Rewriter do
 
           context 'when the order is a Keyset order' do
             let(:order) do
-              Gitlab::Pagination::Keyset::Order.build([
-                Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
-                  attribute_name: 'user_type',
-                  order_expression: User.arel_table['user_type'].desc,
-                  nullable: :not_nullable,
-                  distinct: false
-                )
-              ])
+              Gitlab::Pagination::Keyset::Order.build(
+                [
+                  Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
+                    attribute_name: 'user_type',
+                    order_expression: User.arel_table['user_type'].desc,
+                    nullable: :not_nullable,
+                    distinct: false
+                  )
+                ])
             end
 
             it { is_expected.to be_truthy }
@@ -152,14 +153,15 @@ RSpec.describe UnnestedInFilters::Rewriter do
 
       context 'when the order is a Keyset order' do
         let(:order) do
-          Gitlab::Pagination::Keyset::Order.build([
-            Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
-              attribute_name: 'user_type',
-              order_expression: User.arel_table['user_type'].desc,
-              nullable: :not_nullable,
-              distinct: false
-            )
-          ])
+          Gitlab::Pagination::Keyset::Order.build(
+            [
+              Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
+                attribute_name: 'user_type',
+                order_expression: User.arel_table['user_type'].desc,
+                nullable: :not_nullable,
+                distinct: false
+              )
+            ])
         end
 
         it 'changes the query' do