Skip to content

Remove ruby version check on http request spec #4952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 10, 2025
Merged

Remove ruby version check on http request spec #4952

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42e16ce
Remove ruby version check on request spec
RicardoTrindade Oct 7, 2025
5a385f2
Merge branch 'master' into cleanup_version_check_request_spec
Strech Oct 10, 2025
5f06563
Merge branch 'master' into cleanup_version_check_request_spec
Strech Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions spec/datadog/tracing/contrib/http/request_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,19 +348,7 @@ def expect_request_without_distributed_headers
let(:span) { spans.last }

it 'adds distributed tracing headers' do
# The block syntax only works with Ruby < 2.3 and the hash syntax
# only works with Ruby >= 2.3, so we need to support both.
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
expect(WebMock).to(
have_requested(:get, "#{uri}#{path}").with { |req|
distributed_tracing_headers.all? do |(header, value)|
req.headers[header.split('-').map(&:capitalize).join('-')] == value.to_s
end
}
)
else
expect(WebMock).to have_requested(:get, "#{uri}#{path}").with(headers: distributed_tracing_headers)
end
expect(WebMock).to have_requested(:get, "#{uri}#{path}").with(headers: distributed_tracing_headers)
end
end

Expand Down Expand Up @@ -394,19 +382,7 @@ def expect_request_without_distributed_headers
let(:span) { spans.last }

it 'adds distributed tracing headers' do
# The block syntax only works with Ruby < 2.3 and the hash syntax
# only works with Ruby >= 2.3, so we need to support both.
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
expect(WebMock).to(
have_requested(:get, "#{uri}#{path}").with { |req|
distributed_tracing_headers.all? do |(header, value)|
req.headers[header.split('-').map(&:capitalize).join('-')] == value.to_s
end
}
)
else
expect(WebMock).to have_requested(:get, "#{uri}#{path}").with(headers: distributed_tracing_headers)
end
expect(WebMock).to have_requested(:get, "#{uri}#{path}").with(headers: distributed_tracing_headers)
end
end

Expand Down
Loading