Merge branch 'id-fix-rack-spec-warnings' into 'master'

Fix rack_attack_global_spec 2.7 warnings

See merge request gitlab-org/gitlab!50874

spec/requests/rack_attack_global_spec.rb

@@ -196,8 +196,8 @@ RSpec.describe 'Rack Attack global throttles' do
     let(:api_partial_url) { '/todos' }
 
     context 'with the token in the query string' do
-      let(:request_args) { [api(api_partial_url, personal_access_token: token)] }
-      let(:other_user_request_args) { [api(api_partial_url, personal_access_token: other_user_token)] }
+      let(:request_args) { [api(api_partial_url, personal_access_token: token), {}] }
+      let(:other_user_request_args) { [api(api_partial_url, personal_access_token: other_user_token), {}] }
 
       it_behaves_like 'rate-limited token-authenticated requests'
     end
@@ -258,8 +258,8 @@ RSpec.describe 'Rack Attack global throttles' do
     let(:api_partial_url) { '/todos' }
 
     context 'with the token in the query string' do
-      let(:request_args) { [api(api_partial_url, oauth_access_token: token)] }
-      let(:other_user_request_args) { [api(api_partial_url, oauth_access_token: other_user_token)] }
+      let(:request_args) { [api(api_partial_url, oauth_access_token: token), {}] }
+      let(:other_user_request_args) { [api(api_partial_url, oauth_access_token: other_user_token), {}] }
 
       it_behaves_like 'rate-limited token-authenticated requests'
     end
@@ -376,8 +376,8 @@ RSpec.describe 'Rack Attack global throttles' do
       end
 
       context 'with the token in the query string' do
-        let(:request_args) { [api(api_partial_url, personal_access_token: token)] }
-        let(:other_user_request_args) { [api(api_partial_url, personal_access_token: other_user_token)] }
+        let(:request_args) { [api(api_partial_url, personal_access_token: token), {}] }
+        let(:other_user_request_args) { [api(api_partial_url, personal_access_token: other_user_token), {}] }
 
         it_behaves_like 'rate-limited token-authenticated requests'
       end

spec/support/shared_examples/requests/rack_attack_shared_examples.rb

@@ -154,10 +154,11 @@ RSpec.shared_examples 'rate-limited token-authenticated requests' do
   end
 
   def make_request(args)
+    path, options = args
     if request_method == 'POST'
-      post(*args)
+      post(path, **options)
     else
-      get(*args)
+      get(path, **options)
     end
   end
 end