From ca58eb5e623422b3dfa4e0b8d396ec01d509c87b Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Wed, 28 May 2025 07:13:00 +0000 Subject: [PATCH] [sentry-ruby] fix and improve spec suite setup --- sentry-ruby/.rspec | 4 +++- sentry-ruby/Rakefile | 11 +++++------ sentry-ruby/spec/initialization_check_spec.rb | 2 -- sentry-ruby/spec/isolated/init_spec.rb | 2 -- sentry-ruby/spec/isolated/puma_spec.rb | 4 +++- sentry-ruby/spec/sentry/background_worker_spec.rb | 2 -- sentry-ruby/spec/sentry/backpressure_monitor_spec.rb | 2 -- sentry-ruby/spec/sentry/backtrace/lines_spec.rb | 2 -- sentry-ruby/spec/sentry/backtrace_spec.rb | 2 -- sentry-ruby/spec/sentry/baggage_spec.rb | 2 -- .../spec/sentry/breadcrumb/http_logger_spec.rb | 1 - .../spec/sentry/breadcrumb/redis_logger_spec.rb | 2 -- .../spec/sentry/breadcrumb/sentry_logger_spec.rb | 2 -- sentry-ruby/spec/sentry/breadcrumb_buffer_spec.rb | 2 -- sentry-ruby/spec/sentry/breadcrumb_spec.rb | 2 -- sentry-ruby/spec/sentry/client/event_sending_spec.rb | 2 -- sentry-ruby/spec/sentry/client_spec.rb | 2 -- sentry-ruby/spec/sentry/configuration_spec.rb | 2 -- .../spec/sentry/cron/monitor_check_ins_spec.rb | 2 -- sentry-ruby/spec/sentry/cron/monitor_config_spec.rb | 2 -- sentry-ruby/spec/sentry/cron/monitor_schedule_spec.rb | 2 -- sentry-ruby/spec/sentry/dsn_spec.rb | 2 -- sentry-ruby/spec/sentry/envelope/item_spec.rb | 2 -- sentry-ruby/spec/sentry/event_spec.rb | 2 -- sentry-ruby/spec/sentry/excon_spec.rb | 1 - sentry-ruby/spec/sentry/graphql_spec.rb | 2 -- sentry-ruby/spec/sentry/hub_spec.rb | 3 --- sentry-ruby/spec/sentry/integrable_spec.rb | 1 - sentry-ruby/spec/sentry/interface_spec.rb | 1 - .../spec/sentry/interfaces/request_interface_spec.rb | 2 -- .../spec/sentry/interfaces/stacktrace_builder_spec.rb | 2 -- sentry-ruby/spec/sentry/interfaces/stacktrace_spec.rb | 2 -- sentry-ruby/spec/sentry/linecache_spec.rb | 1 - sentry-ruby/spec/sentry/log_event_buffer_spec.rb | 2 -- sentry-ruby/spec/sentry/log_event_spec.rb | 2 -- sentry-ruby/spec/sentry/metrics/aggregator_spec.rb | 2 -- sentry-ruby/spec/sentry/metrics/configuration_spec.rb | 2 -- .../spec/sentry/metrics/counter_metric_spec.rb | 2 -- .../spec/sentry/metrics/distribution_metric_spec.rb | 2 -- sentry-ruby/spec/sentry/metrics/gauge_metric_spec.rb | 2 -- .../spec/sentry/metrics/local_aggregator_spec.rb | 2 -- sentry-ruby/spec/sentry/metrics/metric_spec.rb | 2 -- sentry-ruby/spec/sentry/metrics/set_metric_spec.rb | 2 -- sentry-ruby/spec/sentry/metrics/timing_spec.rb | 2 -- sentry-ruby/spec/sentry/metrics_spec.rb | 2 -- sentry-ruby/spec/sentry/net/http_spec.rb | 2 -- sentry-ruby/spec/sentry/profiler_spec.rb | 2 -- sentry-ruby/spec/sentry/propagation_context_spec.rb | 2 -- .../spec/sentry/rack/capture_exceptions_spec.rb | 2 -- sentry-ruby/spec/sentry/rake_spec.rb | 2 -- sentry-ruby/spec/sentry/redis_spec.rb | 2 -- sentry-ruby/spec/sentry/rspec/matchers_spec.rb | 1 - sentry-ruby/spec/sentry/scope/setters_spec.rb | 2 -- sentry-ruby/spec/sentry/scope_spec.rb | 2 -- sentry-ruby/spec/sentry/session_flusher_spec.rb | 2 -- sentry-ruby/spec/sentry/span_spec.rb | 2 -- sentry-ruby/spec/sentry/structured_logger_spec.rb | 2 -- sentry-ruby/spec/sentry/test_helper_spec.rb | 2 -- sentry-ruby/spec/sentry/transaction_spec.rb | 2 -- sentry-ruby/spec/sentry/transactions/profiler_spec.rb | 1 - .../spec/sentry/transport/configuration_spec.rb | 2 -- .../transport/http_transport_rate_limiting_spec.rb | 1 - .../spec/sentry/transport/http_transport_spec.rb | 1 - .../spec/sentry/transport/spotlight_transport_spec.rb | 2 -- sentry-ruby/spec/sentry/transport_spec.rb | 2 -- sentry-ruby/spec/sentry/utils/real_ip_spec.rb | 2 -- sentry-ruby/spec/sentry/utils/request_id_spec.rb | 2 -- sentry-ruby/spec/sentry/vernier/profiler_spec.rb | 3 --- sentry-ruby/spec/sentry_spec.rb | 1 - 69 files changed, 11 insertions(+), 132 deletions(-) diff --git a/sentry-ruby/.rspec b/sentry-ruby/.rspec index 8c18f1abd..b1a2596a0 100644 --- a/sentry-ruby/.rspec +++ b/sentry-ruby/.rspec @@ -1,2 +1,4 @@ ---format documentation +--require spec_helper +--format progress --color +--order rand diff --git a/sentry-ruby/Rakefile b/sentry-ruby/Rakefile index 5a01c7f88..534e4cdb3 100644 --- a/sentry-ruby/Rakefile +++ b/sentry-ruby/Rakefile @@ -8,15 +8,14 @@ Bundler::GemHelper.install_tasks(name: "sentry-ruby") require "rspec/core/rake_task" +ISOLATED_SPECS = "spec/isolated/**/*_spec.rb" + RSpec::Core::RakeTask.new(:spec).tap do |task| - task.rspec_opts = "--order rand" - task.exclude_pattern = "spec/isolated/**/*_spec.rb" + task.exclude_pattern = ISOLATED_SPECS end -task :isolated_specs do - Dir["spec/isolated/**/*_spec.rb"].each do |file| - sh "bundle exec rspec #{file}" - end +RSpec::Core::RakeTask.new(:isolated_specs).tap do |task| + task.pattern = ISOLATED_SPECS end task default: [:spec, :isolated_specs] diff --git a/sentry-ruby/spec/initialization_check_spec.rb b/sentry-ruby/spec/initialization_check_spec.rb index 129d5fdff..fa9f72361 100644 --- a/sentry-ruby/spec/initialization_check_spec.rb +++ b/sentry-ruby/spec/initialization_check_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe "with uninitialized SDK" do before do # completely nuke any initialized hubs diff --git a/sentry-ruby/spec/isolated/init_spec.rb b/sentry-ruby/spec/isolated/init_spec.rb index 169d52fde..26daa627f 100644 --- a/sentry-ruby/spec/isolated/init_spec.rb +++ b/sentry-ruby/spec/isolated/init_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_relative "../spec_helper" - # isolated tests need a SimpleCov name otherwise they will overwrite coverage SimpleCov.command_name "RSpecIsolatedInit" diff --git a/sentry-ruby/spec/isolated/puma_spec.rb b/sentry-ruby/spec/isolated/puma_spec.rb index 7ff7e3e1a..f7882cf63 100644 --- a/sentry-ruby/spec/isolated/puma_spec.rb +++ b/sentry-ruby/spec/isolated/puma_spec.rb @@ -1,7 +1,9 @@ # frozen_string_literal: true require "puma" -require_relative "../spec_helper" + +# Force-load the patches so that we don't depend on require order +load Pathname(__FILE__).join("../../../lib/sentry/puma.rb").realpath # Because puma doesn't have any dependency, if Rack is not installed the entire test won't work return if ENV["RACK_VERSION"] == "0" diff --git a/sentry-ruby/spec/sentry/background_worker_spec.rb b/sentry-ruby/spec/sentry/background_worker_spec.rb index fae1b6e50..7295db97d 100644 --- a/sentry-ruby/spec/sentry/background_worker_spec.rb +++ b/sentry-ruby/spec/sentry/background_worker_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::BackgroundWorker do let(:string_io) { StringIO.new } diff --git a/sentry-ruby/spec/sentry/backpressure_monitor_spec.rb b/sentry-ruby/spec/sentry/backpressure_monitor_spec.rb index 04f4ae18f..77040c2ed 100644 --- a/sentry-ruby/spec/sentry/backpressure_monitor_spec.rb +++ b/sentry-ruby/spec/sentry/backpressure_monitor_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::BackpressureMonitor do let(:string_io) { StringIO.new } diff --git a/sentry-ruby/spec/sentry/backtrace/lines_spec.rb b/sentry-ruby/spec/sentry/backtrace/lines_spec.rb index 8a49ea1d8..fa331e10d 100644 --- a/sentry-ruby/spec/sentry/backtrace/lines_spec.rb +++ b/sentry-ruby/spec/sentry/backtrace/lines_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Backtrace::Line do before do perform_basic_setup diff --git a/sentry-ruby/spec/sentry/backtrace_spec.rb b/sentry-ruby/spec/sentry/backtrace_spec.rb index 794465ae1..7a235ba0e 100644 --- a/sentry-ruby/spec/sentry/backtrace_spec.rb +++ b/sentry-ruby/spec/sentry/backtrace_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Backtrace do let(:fixture_root) { File.join(Dir.pwd, "spec", "support") } let(:fixture_file) { File.join(fixture_root, "stacktrace_test_fixture.rb") } diff --git a/sentry-ruby/spec/sentry/baggage_spec.rb b/sentry-ruby/spec/sentry/baggage_spec.rb index a9cc44873..5acbf13ef 100644 --- a/sentry-ruby/spec/sentry/baggage_spec.rb +++ b/sentry-ruby/spec/sentry/baggage_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Baggage do let(:malformed_baggage) { "," } let(:third_party_baggage) { "other-vendor-value-1=foo;bar;baz, other-vendor-value-2=foo;bar;" } diff --git a/sentry-ruby/spec/sentry/breadcrumb/http_logger_spec.rb b/sentry-ruby/spec/sentry/breadcrumb/http_logger_spec.rb index a6a7ecbca..829f638f9 100644 --- a/sentry-ruby/spec/sentry/breadcrumb/http_logger_spec.rb +++ b/sentry-ruby/spec/sentry/breadcrumb/http_logger_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "spec_helper" require 'contexts/with_request_mock' RSpec.describe :http_logger do diff --git a/sentry-ruby/spec/sentry/breadcrumb/redis_logger_spec.rb b/sentry-ruby/spec/sentry/breadcrumb/redis_logger_spec.rb index c6e863be3..1e219d307 100644 --- a/sentry-ruby/spec/sentry/breadcrumb/redis_logger_spec.rb +++ b/sentry-ruby/spec/sentry/breadcrumb/redis_logger_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe :redis_logger do let(:redis) { Redis.new(host: REDIS_HOST) } diff --git a/sentry-ruby/spec/sentry/breadcrumb/sentry_logger_spec.rb b/sentry-ruby/spec/sentry/breadcrumb/sentry_logger_spec.rb index da3cd97c7..4fe034954 100644 --- a/sentry-ruby/spec/sentry/breadcrumb/sentry_logger_spec.rb +++ b/sentry-ruby/spec/sentry/breadcrumb/sentry_logger_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe "Sentry::Breadcrumbs::SentryLogger" do before do perform_basic_setup do |config| diff --git a/sentry-ruby/spec/sentry/breadcrumb_buffer_spec.rb b/sentry-ruby/spec/sentry/breadcrumb_buffer_spec.rb index f8e899cd8..7efb67ae7 100644 --- a/sentry-ruby/spec/sentry/breadcrumb_buffer_spec.rb +++ b/sentry-ruby/spec/sentry/breadcrumb_buffer_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::BreadcrumbBuffer do before do perform_basic_setup diff --git a/sentry-ruby/spec/sentry/breadcrumb_spec.rb b/sentry-ruby/spec/sentry/breadcrumb_spec.rb index e6df98063..008f1741e 100644 --- a/sentry-ruby/spec/sentry/breadcrumb_spec.rb +++ b/sentry-ruby/spec/sentry/breadcrumb_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Breadcrumb do let(:stringio) { StringIO.new } diff --git a/sentry-ruby/spec/sentry/client/event_sending_spec.rb b/sentry-ruby/spec/sentry/client/event_sending_spec.rb index b4e21edff..b24739f16 100644 --- a/sentry-ruby/spec/sentry/client/event_sending_spec.rb +++ b/sentry-ruby/spec/sentry/client/event_sending_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Client do let(:configuration) do Sentry::Configuration.new.tap do |config| diff --git a/sentry-ruby/spec/sentry/client_spec.rb b/sentry-ruby/spec/sentry/client_spec.rb index e165f72b9..a87e81fea 100644 --- a/sentry-ruby/spec/sentry/client_spec.rb +++ b/sentry-ruby/spec/sentry/client_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - class ExceptionWithContext < StandardError def sentry_context { diff --git a/sentry-ruby/spec/sentry/configuration_spec.rb b/sentry-ruby/spec/sentry/configuration_spec.rb index 4a126daee..815943765 100644 --- a/sentry-ruby/spec/sentry/configuration_spec.rb +++ b/sentry-ruby/spec/sentry/configuration_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Configuration do describe "#capture_exception_frame_locals" do it "passes/received the value to #include_local_variables" do diff --git a/sentry-ruby/spec/sentry/cron/monitor_check_ins_spec.rb b/sentry-ruby/spec/sentry/cron/monitor_check_ins_spec.rb index f34600699..b1aafc4b2 100644 --- a/sentry-ruby/spec/sentry/cron/monitor_check_ins_spec.rb +++ b/sentry-ruby/spec/sentry/cron/monitor_check_ins_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Cron::MonitorCheckIns do before { perform_basic_setup } diff --git a/sentry-ruby/spec/sentry/cron/monitor_config_spec.rb b/sentry-ruby/spec/sentry/cron/monitor_config_spec.rb index 1c934e8cc..c6266908b 100644 --- a/sentry-ruby/spec/sentry/cron/monitor_config_spec.rb +++ b/sentry-ruby/spec/sentry/cron/monitor_config_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Cron::MonitorConfig do before { perform_basic_setup } diff --git a/sentry-ruby/spec/sentry/cron/monitor_schedule_spec.rb b/sentry-ruby/spec/sentry/cron/monitor_schedule_spec.rb index 909a9b4fa..9acad1319 100644 --- a/sentry-ruby/spec/sentry/cron/monitor_schedule_spec.rb +++ b/sentry-ruby/spec/sentry/cron/monitor_schedule_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Cron::MonitorSchedule::Crontab do let(:subject) { described_class.new('5 * * * *') } diff --git a/sentry-ruby/spec/sentry/dsn_spec.rb b/sentry-ruby/spec/sentry/dsn_spec.rb index 0a0eaecb4..181c6a1b9 100644 --- a/sentry-ruby/spec/sentry/dsn_spec.rb +++ b/sentry-ruby/spec/sentry/dsn_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::DSN do subject do described_class.new( diff --git a/sentry-ruby/spec/sentry/envelope/item_spec.rb b/sentry-ruby/spec/sentry/envelope/item_spec.rb index f21fb11b7..bdf01dd6c 100644 --- a/sentry-ruby/spec/sentry/envelope/item_spec.rb +++ b/sentry-ruby/spec/sentry/envelope/item_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Envelope::Item do describe '.data_category' do [ diff --git a/sentry-ruby/spec/sentry/event_spec.rb b/sentry-ruby/spec/sentry/event_spec.rb index 90acb4da8..dc8eb9c5c 100644 --- a/sentry-ruby/spec/sentry/event_spec.rb +++ b/sentry-ruby/spec/sentry/event_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Event do let(:configuration) do Sentry::Configuration.new.tap do |config| diff --git a/sentry-ruby/spec/sentry/excon_spec.rb b/sentry-ruby/spec/sentry/excon_spec.rb index 96b4e0a12..4daca4deb 100644 --- a/sentry-ruby/spec/sentry/excon_spec.rb +++ b/sentry-ruby/spec/sentry/excon_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "spec_helper" require "contexts/with_request_mock" require "excon" diff --git a/sentry-ruby/spec/sentry/graphql_spec.rb b/sentry-ruby/spec/sentry/graphql_spec.rb index 4ea948f88..a2740293d 100644 --- a/sentry-ruby/spec/sentry/graphql_spec.rb +++ b/sentry-ruby/spec/sentry/graphql_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - with_graphql = begin require 'graphql' true diff --git a/sentry-ruby/spec/sentry/hub_spec.rb b/sentry-ruby/spec/sentry/hub_spec.rb index 6bf8f6111..b6c5884e5 100644 --- a/sentry-ruby/spec/sentry/hub_spec.rb +++ b/sentry-ruby/spec/sentry/hub_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Hub do let(:string_io) { StringIO.new } let(:logger) do @@ -260,7 +258,6 @@ end end - it "raises error when passing a non-exception object" do expect do subject.capture_exception("String") diff --git a/sentry-ruby/spec/sentry/integrable_spec.rb b/sentry-ruby/spec/sentry/integrable_spec.rb index 891a07403..02a2ed102 100644 --- a/sentry-ruby/spec/sentry/integrable_spec.rb +++ b/sentry-ruby/spec/sentry/integrable_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "spec_helper" require "sentry/integrable" RSpec.describe Sentry::Integrable do diff --git a/sentry-ruby/spec/sentry/interface_spec.rb b/sentry-ruby/spec/sentry/interface_spec.rb index 2d70cdc9b..ade88af2a 100644 --- a/sentry-ruby/spec/sentry/interface_spec.rb +++ b/sentry-ruby/spec/sentry/interface_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' require 'sentry/interface' class TestInterface < Sentry::Interface diff --git a/sentry-ruby/spec/sentry/interfaces/request_interface_spec.rb b/sentry-ruby/spec/sentry/interfaces/request_interface_spec.rb index a7a2225d0..041979e74 100644 --- a/sentry-ruby/spec/sentry/interfaces/request_interface_spec.rb +++ b/sentry-ruby/spec/sentry/interfaces/request_interface_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - return unless defined?(Rack) RSpec.describe Sentry::RequestInterface do diff --git a/sentry-ruby/spec/sentry/interfaces/stacktrace_builder_spec.rb b/sentry-ruby/spec/sentry/interfaces/stacktrace_builder_spec.rb index fd89360a9..77a33fee8 100644 --- a/sentry-ruby/spec/sentry/interfaces/stacktrace_builder_spec.rb +++ b/sentry-ruby/spec/sentry/interfaces/stacktrace_builder_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::StacktraceBuilder do let(:fixture_root) { File.join(Dir.pwd, "spec", "support") } let(:fixture_file) { File.join(fixture_root, "stacktrace_test_fixture.rb") } diff --git a/sentry-ruby/spec/sentry/interfaces/stacktrace_spec.rb b/sentry-ruby/spec/sentry/interfaces/stacktrace_spec.rb index 6ceb0b1d0..f28c3fd4f 100644 --- a/sentry-ruby/spec/sentry/interfaces/stacktrace_spec.rb +++ b/sentry-ruby/spec/sentry/interfaces/stacktrace_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::StacktraceInterface::Frame do describe "#initialize" do let(:configuration) { Sentry::Configuration.new } diff --git a/sentry-ruby/spec/sentry/linecache_spec.rb b/sentry-ruby/spec/sentry/linecache_spec.rb index 097b3ed56..a0cecc5ce 100644 --- a/sentry-ruby/spec/sentry/linecache_spec.rb +++ b/sentry-ruby/spec/sentry/linecache_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' # rubocop:disable Style/WordArray RSpec.describe Sentry::LineCache do describe "#get_file_context" do diff --git a/sentry-ruby/spec/sentry/log_event_buffer_spec.rb b/sentry-ruby/spec/sentry/log_event_buffer_spec.rb index 00c0d4eaf..3733e4b79 100644 --- a/sentry-ruby/spec/sentry/log_event_buffer_spec.rb +++ b/sentry-ruby/spec/sentry/log_event_buffer_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::LogEventBuffer do subject(:log_event_buffer) { described_class.new(Sentry.configuration, client) } diff --git a/sentry-ruby/spec/sentry/log_event_spec.rb b/sentry-ruby/spec/sentry/log_event_spec.rb index b818835b9..331fdfa49 100644 --- a/sentry-ruby/spec/sentry/log_event_spec.rb +++ b/sentry-ruby/spec/sentry/log_event_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::LogEvent do let(:configuration) do Sentry::Configuration.new.tap do |config| diff --git a/sentry-ruby/spec/sentry/metrics/aggregator_spec.rb b/sentry-ruby/spec/sentry/metrics/aggregator_spec.rb index 63d2829df..6094578e9 100644 --- a/sentry-ruby/spec/sentry/metrics/aggregator_spec.rb +++ b/sentry-ruby/spec/sentry/metrics/aggregator_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Metrics::Aggregator do let(:string_io) { StringIO.new } diff --git a/sentry-ruby/spec/sentry/metrics/configuration_spec.rb b/sentry-ruby/spec/sentry/metrics/configuration_spec.rb index 3d04ad3ea..c4bd7d430 100644 --- a/sentry-ruby/spec/sentry/metrics/configuration_spec.rb +++ b/sentry-ruby/spec/sentry/metrics/configuration_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Metrics::Configuration do describe '#before_emit=' do it 'raises error when setting before_emit to anything other than callable or nil' do diff --git a/sentry-ruby/spec/sentry/metrics/counter_metric_spec.rb b/sentry-ruby/spec/sentry/metrics/counter_metric_spec.rb index f1c480b45..198679ed9 100644 --- a/sentry-ruby/spec/sentry/metrics/counter_metric_spec.rb +++ b/sentry-ruby/spec/sentry/metrics/counter_metric_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Metrics::CounterMetric do subject { described_class.new(1) } before { subject.add(2) } diff --git a/sentry-ruby/spec/sentry/metrics/distribution_metric_spec.rb b/sentry-ruby/spec/sentry/metrics/distribution_metric_spec.rb index e8ac709f3..832cb917b 100644 --- a/sentry-ruby/spec/sentry/metrics/distribution_metric_spec.rb +++ b/sentry-ruby/spec/sentry/metrics/distribution_metric_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Metrics::DistributionMetric do subject { described_class.new(1) } before { subject.add(2) } diff --git a/sentry-ruby/spec/sentry/metrics/gauge_metric_spec.rb b/sentry-ruby/spec/sentry/metrics/gauge_metric_spec.rb index fce3141c6..d043bb7f8 100644 --- a/sentry-ruby/spec/sentry/metrics/gauge_metric_spec.rb +++ b/sentry-ruby/spec/sentry/metrics/gauge_metric_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Metrics::GaugeMetric do subject { described_class.new(0) } before { 9.times { |i| subject.add(i + 1) } } diff --git a/sentry-ruby/spec/sentry/metrics/local_aggregator_spec.rb b/sentry-ruby/spec/sentry/metrics/local_aggregator_spec.rb index 3056808da..a41280d6e 100644 --- a/sentry-ruby/spec/sentry/metrics/local_aggregator_spec.rb +++ b/sentry-ruby/spec/sentry/metrics/local_aggregator_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Metrics::LocalAggregator do let(:tags) { [['foo', 1], ['foo', 2], ['bar', 'baz']] } let(:key) { [:c, 'incr', 'second', tags] } diff --git a/sentry-ruby/spec/sentry/metrics/metric_spec.rb b/sentry-ruby/spec/sentry/metrics/metric_spec.rb index ccb4fa222..787d1cb24 100644 --- a/sentry-ruby/spec/sentry/metrics/metric_spec.rb +++ b/sentry-ruby/spec/sentry/metrics/metric_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Metrics::Metric do describe '#add' do it 'raises not implemented error' do diff --git a/sentry-ruby/spec/sentry/metrics/set_metric_spec.rb b/sentry-ruby/spec/sentry/metrics/set_metric_spec.rb index 2cd01da83..59205c7ea 100644 --- a/sentry-ruby/spec/sentry/metrics/set_metric_spec.rb +++ b/sentry-ruby/spec/sentry/metrics/set_metric_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Metrics::SetMetric do subject { described_class.new('foo') } diff --git a/sentry-ruby/spec/sentry/metrics/timing_spec.rb b/sentry-ruby/spec/sentry/metrics/timing_spec.rb index 3b2ee2235..dbc947e7a 100644 --- a/sentry-ruby/spec/sentry/metrics/timing_spec.rb +++ b/sentry-ruby/spec/sentry/metrics/timing_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Metrics::Timing do let(:fake_time) { Time.new(2024, 1, 2, 3, 4, 5) } before { allow(Time).to receive(:now).and_return(fake_time) } diff --git a/sentry-ruby/spec/sentry/metrics_spec.rb b/sentry-ruby/spec/sentry/metrics_spec.rb index 9ca15081f..4aba80417 100644 --- a/sentry-ruby/spec/sentry/metrics_spec.rb +++ b/sentry-ruby/spec/sentry/metrics_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Metrics do before do perform_basic_setup do |config| diff --git a/sentry-ruby/spec/sentry/net/http_spec.rb b/sentry-ruby/spec/sentry/net/http_spec.rb index ebbcc21c4..91402fc79 100644 --- a/sentry-ruby/spec/sentry/net/http_spec.rb +++ b/sentry-ruby/spec/sentry/net/http_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "spec_helper" require 'contexts/with_request_mock' RSpec.describe Sentry::Net::HTTP do @@ -113,7 +112,6 @@ transaction = Sentry.start_transaction Sentry.get_current_scope.set_span(transaction) - response = http.request(request) expect(response.code).to eq("200") diff --git a/sentry-ruby/spec/sentry/profiler_spec.rb b/sentry-ruby/spec/sentry/profiler_spec.rb index 883fac025..4e36cc525 100644 --- a/sentry-ruby/spec/sentry/profiler_spec.rb +++ b/sentry-ruby/spec/sentry/profiler_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Profiler, when: :stack_prof_installed? do before do perform_basic_setup do |config| diff --git a/sentry-ruby/spec/sentry/propagation_context_spec.rb b/sentry-ruby/spec/sentry/propagation_context_spec.rb index 7e16404b6..2ea2960ff 100644 --- a/sentry-ruby/spec/sentry/propagation_context_spec.rb +++ b/sentry-ruby/spec/sentry/propagation_context_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::PropagationContext do before do perform_basic_setup diff --git a/sentry-ruby/spec/sentry/rack/capture_exceptions_spec.rb b/sentry-ruby/spec/sentry/rack/capture_exceptions_spec.rb index 21e1786ef..a8f1b6fba 100644 --- a/sentry-ruby/spec/sentry/rack/capture_exceptions_spec.rb +++ b/sentry-ruby/spec/sentry/rack/capture_exceptions_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' require 'sentry/vernier/profiler' RSpec.describe 'Sentry::Rack::CaptureExceptions', when: :rack_available? do @@ -527,7 +526,6 @@ def will_be_sampled_by_sdk expect(event.contexts.dig(:trace, :trace_id).length).to eq(32) expect(event.contexts.dig(:trace, :trace_id)).to eq(transaction.contexts.dig(:trace, :trace_id)) - expect(transaction.type).to eq("transaction") expect(transaction.timestamp).not_to be_nil expect(transaction.contexts.dig(:trace, :status)).to eq("internal_error") diff --git a/sentry-ruby/spec/sentry/rake_spec.rb b/sentry-ruby/spec/sentry/rake_spec.rb index 904f19170..5f7fb3817 100644 --- a/sentry-ruby/spec/sentry/rake_spec.rb +++ b/sentry-ruby/spec/sentry/rake_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe "rake auto-reporting" do it "sends a report to Sentry" do message = "" diff --git a/sentry-ruby/spec/sentry/redis_spec.rb b/sentry-ruby/spec/sentry/redis_spec.rb index 3130acff1..22e1353ee 100644 --- a/sentry-ruby/spec/sentry/redis_spec.rb +++ b/sentry-ruby/spec/sentry/redis_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Redis do let(:redis) { Redis.new(host: REDIS_HOST) } diff --git a/sentry-ruby/spec/sentry/rspec/matchers_spec.rb b/sentry-ruby/spec/sentry/rspec/matchers_spec.rb index c20a7cfd3..373d9d9a5 100644 --- a/sentry-ruby/spec/sentry/rspec/matchers_spec.rb +++ b/sentry-ruby/spec/sentry/rspec/matchers_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "spec_helper" require "sentry/rspec" RSpec.describe "Sentry RSpec Matchers" do diff --git a/sentry-ruby/spec/sentry/scope/setters_spec.rb b/sentry-ruby/spec/sentry/scope/setters_spec.rb index 39a2e25c1..a688e5c68 100644 --- a/sentry-ruby/spec/sentry/scope/setters_spec.rb +++ b/sentry-ruby/spec/sentry/scope/setters_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Scope do let(:new_breadcrumb) do new_breadcrumb = Sentry::Breadcrumb.new diff --git a/sentry-ruby/spec/sentry/scope_spec.rb b/sentry-ruby/spec/sentry/scope_spec.rb index 4bacae275..05e0eda17 100644 --- a/sentry-ruby/spec/sentry/scope_spec.rb +++ b/sentry-ruby/spec/sentry/scope_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Scope do let(:new_breadcrumb) do new_breadcrumb = Sentry::Breadcrumb.new diff --git a/sentry-ruby/spec/sentry/session_flusher_spec.rb b/sentry-ruby/spec/sentry/session_flusher_spec.rb index d90dfdebf..e0cf1cc2c 100644 --- a/sentry-ruby/spec/sentry/session_flusher_spec.rb +++ b/sentry-ruby/spec/sentry/session_flusher_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::SessionFlusher do let(:string_io) { StringIO.new } diff --git a/sentry-ruby/spec/sentry/span_spec.rb b/sentry-ruby/spec/sentry/span_spec.rb index 0d1fd225c..3a74d4673 100644 --- a/sentry-ruby/spec/sentry/span_spec.rb +++ b/sentry-ruby/spec/sentry/span_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Span do let(:hub) do client = Sentry::Client.new(Sentry::Configuration.new) diff --git a/sentry-ruby/spec/sentry/structured_logger_spec.rb b/sentry-ruby/spec/sentry/structured_logger_spec.rb index ca135ea49..0deaf8229 100644 --- a/sentry-ruby/spec/sentry/structured_logger_spec.rb +++ b/sentry-ruby/spec/sentry/structured_logger_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::StructuredLogger do context "when enable_logs is set to false" do before do diff --git a/sentry-ruby/spec/sentry/test_helper_spec.rb b/sentry-ruby/spec/sentry/test_helper_spec.rb index 8303464c8..caf4e1c3f 100644 --- a/sentry-ruby/spec/sentry/test_helper_spec.rb +++ b/sentry-ruby/spec/sentry/test_helper_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::TestHelper do include described_class diff --git a/sentry-ruby/spec/sentry/transaction_spec.rb b/sentry-ruby/spec/sentry/transaction_spec.rb index fd640aa15..4ee843479 100644 --- a/sentry-ruby/spec/sentry/transaction_spec.rb +++ b/sentry-ruby/spec/sentry/transaction_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Transaction do before do perform_basic_setup diff --git a/sentry-ruby/spec/sentry/transactions/profiler_spec.rb b/sentry-ruby/spec/sentry/transactions/profiler_spec.rb index 78bb385bc..1fbd52950 100644 --- a/sentry-ruby/spec/sentry/transactions/profiler_spec.rb +++ b/sentry-ruby/spec/sentry/transactions/profiler_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "spec_helper" require 'contexts/with_request_mock' RSpec.describe Sentry, 'transactions / profiler', when: [:vernier_installed?, :rack_available?] do diff --git a/sentry-ruby/spec/sentry/transport/configuration_spec.rb b/sentry-ruby/spec/sentry/transport/configuration_spec.rb index fa3edd87b..80dd151d1 100644 --- a/sentry-ruby/spec/sentry/transport/configuration_spec.rb +++ b/sentry-ruby/spec/sentry/transport/configuration_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Transport::Configuration do describe "#transport_class=" do it "doesn't accept non-class argument" do diff --git a/sentry-ruby/spec/sentry/transport/http_transport_rate_limiting_spec.rb b/sentry-ruby/spec/sentry/transport/http_transport_rate_limiting_spec.rb index 64ac79ef1..d1c1081d6 100644 --- a/sentry-ruby/spec/sentry/transport/http_transport_rate_limiting_spec.rb +++ b/sentry-ruby/spec/sentry/transport/http_transport_rate_limiting_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' require 'contexts/with_request_mock' RSpec.describe "rate limiting" do diff --git a/sentry-ruby/spec/sentry/transport/http_transport_spec.rb b/sentry-ruby/spec/sentry/transport/http_transport_spec.rb index 1606a562e..7b4b39b97 100644 --- a/sentry-ruby/spec/sentry/transport/http_transport_spec.rb +++ b/sentry-ruby/spec/sentry/transport/http_transport_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' require 'contexts/with_request_mock' RSpec.describe Sentry::HTTPTransport do diff --git a/sentry-ruby/spec/sentry/transport/spotlight_transport_spec.rb b/sentry-ruby/spec/sentry/transport/spotlight_transport_spec.rb index 1a1beb761..2b54a7fd3 100644 --- a/sentry-ruby/spec/sentry/transport/spotlight_transport_spec.rb +++ b/sentry-ruby/spec/sentry/transport/spotlight_transport_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::SpotlightTransport do let(:configuration) do Sentry::Configuration.new.tap do |config| diff --git a/sentry-ruby/spec/sentry/transport_spec.rb b/sentry-ruby/spec/sentry/transport_spec.rb index 2b4810deb..002ede4f5 100644 --- a/sentry-ruby/spec/sentry/transport_spec.rb +++ b/sentry-ruby/spec/sentry/transport_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Transport do let(:io) { StringIO.new } let(:logger) { Logger.new(io) } diff --git a/sentry-ruby/spec/sentry/utils/real_ip_spec.rb b/sentry-ruby/spec/sentry/utils/real_ip_spec.rb index 42197b9f2..f9032f297 100644 --- a/sentry-ruby/spec/sentry/utils/real_ip_spec.rb +++ b/sentry-ruby/spec/sentry/utils/real_ip_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spec_helper' - RSpec.describe Sentry::Utils::RealIp do context "when no ip addresses are provided other than REMOTE_ADDR" do subject { Sentry::Utils::RealIp.new(remote_addr: "1.1.1.1") } diff --git a/sentry-ruby/spec/sentry/utils/request_id_spec.rb b/sentry-ruby/spec/sentry/utils/request_id_spec.rb index 955bd8894..906ab1a7d 100644 --- a/sentry-ruby/spec/sentry/utils/request_id_spec.rb +++ b/sentry-ruby/spec/sentry/utils/request_id_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - RSpec.describe Sentry::Utils::RequestId do describe ".read_from" do subject { Sentry::Utils::RequestId.read_from(env_hash) } diff --git a/sentry-ruby/spec/sentry/vernier/profiler_spec.rb b/sentry-ruby/spec/sentry/vernier/profiler_spec.rb index 1758d30a8..a46c7900e 100644 --- a/sentry-ruby/spec/sentry/vernier/profiler_spec.rb +++ b/sentry-ruby/spec/sentry/vernier/profiler_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "spec_helper" - require "sentry/vernier/profiler" RSpec.describe Sentry::Vernier::Profiler, when: { ruby_version?: [:>=, "3.3"] } do @@ -152,7 +150,6 @@ describe "#to_hash" do let (:transport) { Sentry.get_current_client.transport } - it "records lost event if not sampled" do expect(transport).to receive(:record_lost_event).with(:sample_rate, "profile") diff --git a/sentry-ruby/spec/sentry_spec.rb b/sentry-ruby/spec/sentry_spec.rb index bd97cdc6c..f413b19d0 100644 --- a/sentry-ruby/spec/sentry_spec.rb +++ b/sentry-ruby/spec/sentry_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "spec_helper" require 'contexts/with_request_mock' RSpec.describe Sentry do