Skip to content
Snippets Groups Projects
Verified Commit 945f45f6 authored by Stan Hu's avatar Stan Hu
Browse files

Fix Ruby 3.1 and 3.2 builds

rspec and rspec-parameterized gems had to be updated to make keyword
argument matching work properly.

In addition, the spec needed to be updated so that
`Labkit::Tracing::Factory.create_tracer` was passing in a Hash instead
of keyword arguments.
parent 6a628d50
No related branches found
No related tags found
1 merge request!113Add and fix Ruby 3.1 and 3.2 to CI builds
......@@ -39,8 +39,8 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "rack", "~> 2.0"
spec.add_development_dependency "rake", "~> 12.3"
spec.add_development_dependency "rest-client", "~> 2.1.0"
spec.add_development_dependency "rspec", "~> 3.10.0"
spec.add_development_dependency "rspec-parameterized", "~> 0.4"
spec.add_development_dependency "rspec", "~> 3.12.0"
spec.add_development_dependency "rspec-parameterized", "~> 1.0"
spec.add_development_dependency "rufo", "0.9.0"
spec.add_development_dependency "sidekiq", ">= 5.2", "< 7"
spec.add_development_dependency "webrick", "~> 1.7.0"
......
......@@ -32,7 +32,7 @@ describe Labkit::Tracing::Factory do
end
it "processes connections with parameters" do
expect(Labkit::Tracing::JaegerFactory).to receive(:create_tracer).with(service_name, a: "1", b: "2", c: "3").and_return(mock_tracer)
expect(Labkit::Tracing::JaegerFactory).to receive(:create_tracer).with(service_name, { a: "1", b: "2", c: "3" }).and_return(mock_tracer)
expect(described_class.create_tracer(service_name, "opentracing://jaeger?a=1&b=2&c=3")).to be(mock_tracer)
end
......@@ -40,10 +40,12 @@ describe Labkit::Tracing::Factory do
it "processes connections with basic auth credentials" do
expect(Labkit::Tracing::JaegerFactory).to receive(:create_tracer).with(
service_name,
a: "1",
b: "2",
c: "3",
http_endpoint: "https://foo:bar@observe.gitlab.com",
{
a: "1",
b: "2",
c: "3",
http_endpoint: "https://foo:bar@observe.gitlab.com",
}
).and_return(mock_tracer)
expect(described_class.create_tracer(service_name, "opentracing://jaeger?http_endpoint=https://foo:bar@observe.gitlab.com&a=1&b=2&c=3")).to be(mock_tracer)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment