Skip to content

test: continue switch to rspec-mocks #2059

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

Open
thompson-tomo wants to merge 13 commits into
base: main
Choose a base branch
from
Open

test: continue switch to rspec-mocks #2059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b061698
Replace stubs with allow
thompson-tomo Mar 8, 2026
01705c4
replacing minitest.mock
thompson-tomo Mar 8, 2026
4a68be1
add missing requires
thompson-tomo Mar 8, 2026
05fc688
add rspec to gemfile
thompson-tomo Mar 8, 2026
ad1eab1
Update resque_job_test.rb
thompson-tomo Mar 8, 2026
5b730b1
Update aws_test.rb
thompson-tomo Mar 8, 2026
f523645
typo fix
thompson-tomo Mar 8, 2026
f6d5d87
Update eks_test.rb
thompson-tomo Mar 8, 2026
bd0dd73
switch to with
thompson-tomo Mar 8, 2026
5921410
increase consistency
thompson-tomo Mar 8, 2026
6515dd7
Merge branch 'main' into patch-10
thompson-tomo Mar 14, 2026
8f457ea
Update task_test.rb
thompson-tomo Mar 19, 2026
9ad48ed
Merge branch 'main' into patch-10
robbkidd Mar 20, 2026
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
1 change: 1 addition & 0 deletions .instrumentation_generator/templates/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ group :test do
gem 'opentelemetry-sdk', '~> 1.0'
gem 'opentelemetry-test-helpers', '~> 0.3'
gem 'rake', '>= 13'
gem 'rspec-mocks', '~> 3.13.7'
gem 'rubocop', '~> 1.85.0'
gem 'rubocop-performance', '~> 1.26.0'
gem 'simplecov', '~> 0.22.0'
Expand Down
8 changes: 3 additions & 5 deletions instrumentation/rake/test/opentelemetry/instrumentation/rake/patches/task_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@

describe 'with a task argument' do
it 'should call force_flush on OpenTelemetry.tracer_provider' do
mock = Minitest::Mock.new
mock.expect(:force_flush, nil)
mock.expect(:force_flush, nil)
mock = instance_double(OpenTelemetry::SDK::Trace::TracerProvider)
allow(mock).to receive(:force_flush).and_return(nil)
expect(mock).to have_received(:force_flush).twice

Rake::Task.define_task("#{task_name}[:arg]")
task_string = "#{task_name}[test_arg]"
Expand All @@ -69,8 +69,6 @@

allow(OpenTelemetry).to receive(:tracer_provider).and_return(mock)
Rake.application.invoke_task(task_string)

mock.verify
end
end

Expand Down
1 change: 1 addition & 0 deletions instrumentation/resque/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ group :test do
gem 'opentelemetry-sdk', '~> 1.1'
gem 'opentelemetry-test-helpers', '~> 0.3'
gem 'rake', '>= 13'
gem 'rspec-mocks', '~> 3.13.7'
gem 'rubocop', '~> 1.85.0'
gem 'rubocop-performance', '~> 1.26.0'
gem 'simplecov', '~> 0.22.0'
Expand Down
27 changes: 12 additions & 15 deletions instrumentation/resque/test/opentelemetry/instrumentation/resque/patches/resque_job_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,47 +190,44 @@
let(:config) { { force_flush: :ask_the_job } }

it 'asks the job and skips forcibly flushing the tracer' do
mock_tracer_provider = Minitest::Mock.new
mock_tracer_provider.expect(:force_flush, true)
mock_tracer_provider = instance_double(OpenTelemetry::SDK::Trace::TracerProvider)
allow(mock_tracer_provider).to receive(:force_flush).and_return(true)
allow(OpenTelemetry).to receive(:tracer_provider).and_return(mock_tracer_provider)

OpenTelemetry.stub :tracer_provider, mock_tracer_provider do
Resque.enqueue(DummyJob)
work_off_jobs
end

expect { mock_tracer_provider.verify }.must_raise MockExpectationError
expect(mock_tracer_provider).not_to have_received(:force_flush)
end
end

describe 'always' do
let(:config) { { force_flush: :always } }

it 'does forcibly flush the tracer' do
mock_tracer_provider = Minitest::Mock.new
mock_tracer_provider.expect(:force_flush, true)
mock_tracer_provider = instance_double(OpenTelemetry::SDK::Trace::TracerProvider)
allow(mock_tracer_provider).to receive(:force_flush).and_return(true)
allow(OpenTelemetry).to receive(:tracer_provider).and_return(mock_tracer_provider)

OpenTelemetry.stub :tracer_provider, mock_tracer_provider do
Resque.enqueue(DummyJob)
work_off_jobs
end

mock_tracer_provider.verify
expect(mock_tracer_provider).to have_received(:force_flush)
end
end

describe 'never' do
let(:config) { { force_flush: :never } }

it 'does not forcibly flush the tracer' do
mock_tracer_provider = Minitest::Mock.new
mock_tracer_provider.expect(:force_flush, true)
mock_tracer_provider = instance_double(OpenTelemetry::SDK::Trace::TracerProvider)
allow(mock_tracer_provider).to receive(:force_flush).and_return(true)
allow(OpenTelemetry).to receive(:tracer_provider).and_return(mock_tracer_provider)

OpenTelemetry.stub :tracer_provider, mock_tracer_provider do
Resque.enqueue(DummyJob)
work_off_jobs
end

expect { mock_tracer_provider.verify }.must_raise MockExpectationError
expect(mock_tracer_provider).not_to have_received(:force_flush)
end
end
end
Expand Down
1 change: 1 addition & 0 deletions instrumentation/resque/test/test_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
require 'active_job'

require 'minitest/autorun'
require 'rspec/mocks/minitest_integration'
require 'webmock/minitest'

# global opentelemetry-sdk setup:
Expand Down
1 change: 1 addition & 0 deletions processor/baggage/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ group :test do
gem 'minitest', '~> 5.0'
gem 'opentelemetry-sdk', '~> 1.1'
gem 'rake', '>= 13'
gem 'rspec-mocks', '~> 3.13.7'
gem 'rubocop', '~> 1.85.0'
gem 'rubocop-performance', '~> 1.26.0'
gem 'simplecov', '~> 0.22.0'
Expand Down
20 changes: 10 additions & 10 deletions processor/baggage/test/opentelemetry/processor/baggage/baggage_span_processor_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
OpenTelemetry::Processor::Baggage::ALLOW_ALL_BAGGAGE_KEYS
)
end
let(:span) { Minitest::Mock.new }
let(:span) { instance_double(OpenTelemetry::Trace::Span) }
let(:context_with_baggage) do
OpenTelemetry::Baggage.build(context: OpenTelemetry::Context.empty) do |baggage|
baggage.set_value('a_key', 'a_value')
Expand All @@ -50,11 +50,11 @@
describe '#on_start' do
describe 'with the ALLOW_ALL_BAGGAGE_KEYS predicate' do
it 'adds current baggage keys/values as attributes when a span starts' do
span.expect(:add_attributes, span, [{ 'a_key' => 'a_value', 'b_key' => 'b_value' }])
expect(span).to receive(:add_attributes)
.with({ 'a_key' => 'a_value', 'b_key' => 'b_value' })
.and_return(span)

processor.on_start(span, context_with_baggage)

span.verify
end
end

Expand All @@ -66,11 +66,11 @@
end

it 'only adds attributes that pass the keyfilter' do
span.expect(:add_attributes, span, [{ 'a_key' => 'a_value' }])
expect(span).to receive(:add_attributes)
.with({ 'a_key' => 'a_value' })
.and_return(span)

start_with_processor.on_start(span, context_with_baggage)

span.verify
end
end

Expand All @@ -82,11 +82,11 @@
end

it 'only adds attributes that pass the keyfilter' do
span.expect(:add_attributes, span, [{ 'b_key' => 'b_value' }])
expect(span).to receive(:add_attributes)
.with({ 'b_key' => 'b_value' })
.and_return(span)

regex_processor.on_start(span, context_with_baggage)

span.verify
end
end

Expand Down
1 change: 1 addition & 0 deletions processor/baggage/test/test_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
Bundler.require(:default, :development, :test)

require 'minitest/autorun'
require 'rspec/mocks/minitest_integration'
require 'opentelemetry-processor-baggage'
1 change: 1 addition & 0 deletions resources/aws/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ gemspec
group :test do
gem 'minitest', '~> 5.0'
gem 'rake', '>= 13'
gem 'rspec-mocks', '~> 3.13.7'
gem 'rubocop', '~> 1.85.0'
gem 'rubocop-performance', '~> 1.26.0'
gem 'simplecov', '~> 0.22.0'
Expand Down
6 changes: 2 additions & 4 deletions resources/aws/test/opentelemetry/resource/detector/aws/ecs_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@

it 'detects ECS resources' do
# Stub the fetch_container_id method directly rather than trying to stub File
detector.stub :fetch_container_id, '0123456789abcdef' * 4 do
Socket.stub :gethostname, hostname do
allow(detector).to receive(:fetch_container_id).and_return('0123456789abcdef' * 4)
allow(Socket).to receive(:gethostname).and_return(hostname)
resource = detector.detect

_(resource).must_be_instance_of(OpenTelemetry::SDK::Resources::Resource)
Expand All @@ -100,8 +100,6 @@
_(attributes[OpenTelemetry::SemanticConventions::Resource::AWS_LOG_STREAM_ARNS]).must_equal(['arn:aws:logs:us-west-2:123456789012:log-group:my-log-group:log-stream:my-log-stream'])
end
end
end
end

describe 'when metadata endpoint fails' do
before do
Expand Down
Loading
Loading