Commit 7e2e28ab authored by Stan Hu's avatar Stan Hu

Merge branch 'id-adjust-specs-to-2-7' into 'master'

Adjust some specs to Ruby 2.7

See merge request gitlab-org/gitlab!40490
parents 678093c8 11f7c5a7
...@@ -171,7 +171,7 @@ RSpec.describe Projects::Settings::OperationsController do ...@@ -171,7 +171,7 @@ RSpec.describe Projects::Settings::OperationsController do
new_incident_management_settings = params new_incident_management_settings = params
expect(Gitlab::Tracking).to receive(:event) expect(Gitlab::Tracking).to receive(:event)
.with('IncidentManagement::Settings', event_key, kind_of(Hash)) .with('IncidentManagement::Settings', event_key, any_args)
patch :update, params: project_params(project, incident_management_setting_attributes: new_incident_management_settings) patch :update, params: project_params(project, incident_management_setting_attributes: new_incident_management_settings)
......
...@@ -11,7 +11,7 @@ RSpec.describe Gitlab::Tracking::IncidentManagement do ...@@ -11,7 +11,7 @@ RSpec.describe Gitlab::Tracking::IncidentManagement do
.with( .with(
'IncidentManagement::Settings', 'IncidentManagement::Settings',
label, label,
value || kind_of(Hash) value || any_args
) )
end end
end end
......
...@@ -25,6 +25,6 @@ module DnsHelpers ...@@ -25,6 +25,6 @@ module DnsHelpers
def permit_local_dns! def permit_local_dns!
local_addresses = /\A(127|10)\.0\.0\.\d{1,3}|(192\.168|172\.16)\.\d{1,3}\.\d{1,3}|0\.0\.0\.0|localhost\z/i local_addresses = /\A(127|10)\.0\.0\.\d{1,3}|(192\.168|172\.16)\.\d{1,3}\.\d{1,3}|0\.0\.0\.0|localhost\z/i
allow(Addrinfo).to receive(:getaddrinfo).with(local_addresses, anything, nil, :STREAM).and_call_original allow(Addrinfo).to receive(:getaddrinfo).with(local_addresses, anything, nil, :STREAM).and_call_original
allow(Addrinfo).to receive(:getaddrinfo).with(local_addresses, anything, nil, :STREAM, anything, anything).and_call_original allow(Addrinfo).to receive(:getaddrinfo).with(local_addresses, anything, nil, :STREAM, anything, anything, any_args).and_call_original
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment