Skip to content

Commit 1cdfc76

Browse files
test: Switch to RSpec Mocks (#2011)
1 parent 79fe4f3 commit 1cdfc76

95 files changed

Lines changed: 451 additions & 431 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

helpers/mysql/Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ gemspec
1010

1111
group :test do
1212
gem 'minitest', '~> 5.0'
13+
gem 'rspec-mocks', '~> 3.13.7'
1314
gem 'opentelemetry-test-helpers', '~> 0.3'
1415
gem 'rake', '>= 13'
1516
gem 'rubocop', '~> 1.84.0'
@@ -21,5 +22,6 @@ group :test do
2122
gem 'base64'
2223
gem 'logger'
2324
gem 'mutex_m'
25+
gem 'logger'
2426
end
2527
end

helpers/mysql/test/helpers/mysql_test.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,11 @@
149149
it 'logs a message' do
150150
result = nil
151151
OpenTelemetry::TestHelpers.with_test_logger do |log_stream|
152-
OpenTelemetry::Common::Utilities.stub(:utf8_encode, ->(_) { raise 'boom!' }) do
153-
extract_statement_type
152+
allow(OpenTelemetry::Common::Utilities).to receive(:utf8_encode) { |_| raise 'boom!' }
153+
extract_statement_type
154154

155-
assert_nil(result)
156-
assert_match(/Error extracting/, log_stream.string)
157-
end
155+
assert_nil(result)
156+
assert_match(/Error extracting/, log_stream.string)
158157
end
159158
end
160159
end

helpers/mysql/test/test_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
require 'opentelemetry'
1212
require 'opentelemetry-helpers-mysql'
1313
require 'minitest/autorun'
14+
require 'rspec/mocks/minitest_integration'
1415

1516
OpenTelemetry.logger = Logger.new($stderr, level: ENV.fetch('OTEL_LOG_LEVEL', 'fatal').to_sym)

helpers/sql-obfuscation/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ group :test do
2020
if RUBY_VERSION >= '3.4'
2121
gem 'base64'
2222
gem 'mutex_m'
23+
gem 'logger'
2324
end
2425
end

helpers/sql-processor/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ group :test do
2222
gem 'base64'
2323
gem 'logger'
2424
gem 'mutex_m'
25+
gem 'logger'
2526
end
2627
end

helpers/sql/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ group :test do
2121
gem 'base64'
2222
gem 'logger'
2323
gem 'mutex_m'
24+
gem 'logger'
2425
end
2526
end

instrumentation/action_mailer/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ group :test do
2727
if RUBY_VERSION >= '3.4'
2828
gem 'base64'
2929
gem 'mutex_m'
30+
gem 'logger'
3031
end
3132
end

instrumentation/action_pack/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ group :test do
2424
if RUBY_VERSION >= '3.4'
2525
gem 'base64'
2626
gem 'mutex_m'
27+
gem 'logger'
2728
end
2829
end

instrumentation/action_view/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ group :test do
2424
if RUBY_VERSION >= '3.4'
2525
gem 'base64'
2626
gem 'mutex_m'
27+
gem 'logger'
2728
end
2829
end

instrumentation/active_job/Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ gemspec
1111
group :test do
1212
gem 'appraisal', '~> 2.5'
1313
gem 'minitest', '~> 5.0'
14+
gem 'rspec-mocks', '~> 3.13.7'
1415
gem 'opentelemetry-sdk', '~> 1.1'
1516
gem 'opentelemetry-test-helpers', '~> 0.3'
1617
gem 'rake', '>= 13'
@@ -23,5 +24,6 @@ group :test do
2324
if RUBY_VERSION >= '3.4'
2425
gem 'base64'
2526
gem 'mutex_m'
27+
gem 'logger'
2628
end
2729
end

0 commit comments

Comments
 (0)