Fix specs after rebase

sl0thentr0py · sl0thentr0py · commit 8bc301eb69fa · 2025-09-23T13:57:57.000+02:00
diff --git a/sentry-rails/spec/sentry/rails/tracing/active_storage_subscriber_spec.rb b/sentry-rails/spec/sentry/rails/tracing/active_storage_subscriber_spec.rb
@@ -68,7 +68,7 @@
         p = Post.create!
         get "/posts/#{p.id}/attach"
 
-        request_transaction = transport.events.last.to_hash
+        request_transaction = transport.events.last.to_h
         expect(request_transaction[:type]).to eq("transaction")
         expect(request_transaction[:spans].count).to eq(2)
 
diff --git a/sentry-rails/spec/sentry/rails/tracing/active_support_subscriber_spec.rb b/sentry-rails/spec/sentry/rails/tracing/active_support_subscriber_spec.rb
@@ -23,7 +23,7 @@
       transaction.finish
 
       expect(transport.events.count).to eq(1)
-      cache_transaction = transport.events.first.to_hash
+      cache_transaction = transport.events.first.to_h
       expect(cache_transaction[:type]).to eq("transaction")
 
       expect(cache_transaction[:spans].count).to eq(1)
@@ -45,7 +45,7 @@
 
       expect(Rails.cache.read("my_cache_key")).to eq(1)
       expect(transport.events.count).to eq(1)
-      cache_transaction = transport.events.first.to_hash
+      cache_transaction = transport.events.first.to_h
       expect(cache_transaction[:type]).to eq("transaction")
       expect(cache_transaction[:spans].count).to eq(1)
       expect(cache_transaction[:spans][0][:op]).to eq("cache.put")
@@ -64,7 +64,7 @@
       transaction.finish
 
       expect(transport.events.count).to eq(1)
-      cache_transaction = transport.events.first.to_hash
+      cache_transaction = transport.events.first.to_h
       expect(cache_transaction[:type]).to eq("transaction")
       expect(cache_transaction[:spans].count).to eq(1)
       expect(cache_transaction[:spans][0][:op]).to eq("cache.put")
@@ -79,7 +79,7 @@
       transaction.finish
 
       expect(transport.events.count).to eq(1)
-      cache_transaction = transport.events.first.to_hash
+      cache_transaction = transport.events.first.to_h
       expect(cache_transaction[:type]).to eq("transaction")
       expect(cache_transaction[:spans].count).to eq(1)
       expect(cache_transaction[:spans][0][:op]).to eq("cache.get")
@@ -95,7 +95,7 @@
       transaction.finish
 
       expect(transport.events.count).to eq(1)
-      cache_transaction = transport.events.first.to_hash
+      cache_transaction = transport.events.first.to_h
       expect(cache_transaction[:type]).to eq("transaction")
       expect(cache_transaction[:spans].count).to eq(1)
       expect(cache_transaction[:spans][0][:op]).to eq("cache.get")
@@ -112,7 +112,7 @@
       transaction.finish
 
       expect(transport.events.count).to eq(1)
-      cache_transaction = transport.events.first.to_hash
+      cache_transaction = transport.events.first.to_h
       expect(cache_transaction[:type]).to eq("transaction")
       expect(cache_transaction[:spans].count).to eq(2)
       expect(cache_transaction[:spans][1][:op]).to eq("cache.flush")
@@ -130,7 +130,7 @@
 
       transaction.finish
       expect(transport.events.count).to eq(1)
-      cache_transaction = transport.events.first.to_hash
+      cache_transaction = transport.events.first.to_h
       expect(cache_transaction[:type]).to eq("transaction")
       expect(cache_transaction[:spans].count).to eq(2)
       expect(cache_transaction[:spans][0][:op]).to eq("cache.get")
@@ -152,7 +152,7 @@
 
       transaction.finish
       expect(transport.events.count).to eq(1)
-      cache_transaction = transport.events.first.to_hash
+      cache_transaction = transport.events.first.to_h
       expect(cache_transaction[:type]).to eq("transaction")
       expect(cache_transaction[:spans].count).to eq(1)
       expect(cache_transaction[:spans][0][:op]).to eq("cache.remove")
diff --git a/sentry-rails/spec/sentry/rails/tracing_spec.rb b/sentry-rails/spec/sentry/rails/tracing_spec.rb
@@ -123,7 +123,7 @@
 
       it "does not record sensitive params" do
         get "/posts?foo=bar&password=42&secret=baz"
-        transaction = transport.events.last.to_hash
+        transaction = transport.events.last.to_h
 
         params = transaction[:spans][0][:data][:params]
         expect(params["foo"]).to eq("bar")
@@ -145,7 +145,7 @@
 
       it "records all params" do
         get "/posts?foo=bar&password=42&secret=baz"
-        transaction = transport.events.last.to_hash
+        transaction = transport.events.last.to_h
 
         params = transaction[:spans][0][:data][:params]
         expect(params["foo"]).to eq("bar")
diff --git a/sentry-resque/spec/sentry/resque_spec.rb b/sentry-resque/spec/sentry/resque_spec.rb
@@ -222,7 +222,7 @@ def self.perform(msg)
           process_job(worker)
         end.not_to raise_error(TypeError)
 
-        event = transport.events.last.to_hash
+        event = transport.events.last.to_h
         expect(event.dig(:exception, :values, 0, :type)).to eq("ZeroDivisionError")
       end
     end
diff --git a/sentry-ruby/lib/sentry/client.rb b/sentry-ruby/lib/sentry/client.rb
@@ -287,15 +287,15 @@ def send_logs(log_events)
           processed_log_event = configuration.before_send_log.call(log_event)
 
           if processed_log_event
-            envelope_items << processed_log_event.to_hash
+            envelope_items << processed_log_event.to_h
           else
             discarded_count += 1
           end
         end
 
         envelope_items
       else
-        envelope_items = log_events.map(&:to_hash)
+        envelope_items = log_events.map(&:to_h)
       end
 
       envelope.add_item(
diff --git a/sentry-ruby/lib/sentry/log_event.rb b/sentry-ruby/lib/sentry/log_event.rb
@@ -87,7 +87,7 @@ def initialize(configuration: Sentry.configuration, **options)
       @contexts = {}
     end
 
-    def to_hash
+    def to_h
       SERIALIZEABLE_ATTRIBUTES.each_with_object({}) do |name, memo|
         memo[name] = serialize(name)
       end
diff --git a/sentry-ruby/lib/sentry/rspec.rb b/sentry-ruby/lib/sentry/rspec.rb
@@ -70,7 +70,7 @@ def find_matched_event(event_message, sentry_events)
   end
 
   def dump_events(sentry_events)
-    sentry_events.map(&Kernel.method(:Hash)).map do |hash|
+    sentry_events.map(&:to_h).map do |hash|
       hash.select { |k, _| [:message, :contexts, :tags, :exception].include?(k) }
     end.map do |hash|
       JSON.pretty_generate(hash)
diff --git a/sentry-ruby/lib/sentry/vernier/profiler.rb b/sentry-ruby/lib/sentry/vernier/profiler.rb
@@ -90,7 +90,7 @@ def active_thread_id
         Thread.current.object_id
       end
 
-      def to_hash
+      def to_h
         unless @sampled
           record_lost_event(:sample_rate)
           return EMPTY_RESULT
diff --git a/sentry-ruby/spec/sentry/breadcrumb_spec.rb b/sentry-ruby/spec/sentry/breadcrumb_spec.rb
@@ -107,7 +107,7 @@
     end
 
     it "rescues data serialization issue for extremely nested data and ditch the data" do
-      result = very_deep_crumb.to_hash
+      result = very_deep_crumb.to_h
 
       expect(result[:category]).to eq("cow")
       expect(result[:message]).to eq("I cause too much recursion")
diff --git a/sentry-ruby/spec/sentry/event_spec.rb b/sentry-ruby/spec/sentry/event_spec.rb
@@ -144,7 +144,7 @@
       it "doesn't overwrite already set ip address" do
         Sentry.set_user({ ip_address: "3.3.3.3" })
         Sentry.get_current_scope.apply_to_event(event)
-        expect(event.to_hash[:user][:ip_address]).to eq("3.3.3.3")
+        expect(event.to_h[:user][:ip_address]).to eq("3.3.3.3")
       end
 
       context "with config.trusted_proxies = [\"2.2.2.2\"]" do
diff --git a/sentry-ruby/spec/sentry/log_event_spec.rb b/sentry-ruby/spec/sentry/log_event_spec.rb
@@ -48,7 +48,7 @@
     end
   end
 
-  describe "#to_hash" do
+  describe "#to_h" do
     before do
       configuration.release = "1.2.3"
       configuration.environment = "test"
@@ -65,7 +65,7 @@
         attributes: attributes
       )
 
-      hash = event.to_hash
+      hash = event.to_h
 
       expect(hash[:body]).to eq("Hello John, today is Monday")
 
@@ -82,7 +82,7 @@
         body: "User John has logged in!"
       )
 
-      hash = event.to_hash
+      hash = event.to_h
 
       expect(hash[:level]).to eq("info")
       expect(hash[:body]).to eq("User John has logged in!")
@@ -102,7 +102,7 @@
         body: "User John has logged in!"
       )
 
-      hash = event.to_hash
+      hash = event.to_h
 
       expect(hash[:attributes]).not_to have_key("sentry.message.template")
     end
@@ -114,7 +114,7 @@
         body: "Hello %{name}, today is %{day}"
       )
 
-      hash = event.to_hash
+      hash = event.to_h
 
       expect(hash[:attributes]).not_to have_key("sentry.message.template")
       expect(hash[:attributes]).not_to have_key("sentry.message.parameter.name")
@@ -133,7 +133,7 @@
         attributes: attributes
       )
 
-      hash = event.to_hash
+      hash = event.to_h
 
       expect(hash[:attributes]).to have_key("sentry.message.template")
       expect(hash[:attributes]["sentry.message.template"]).to eq({ value: "User %s has logged in!", type: "string" })
@@ -155,7 +155,7 @@
         attributes: attributes
       )
 
-      hash = event.to_hash
+      hash = event.to_h
 
       expect(hash[:attributes]["string_attr"]).to eq({ value: "string value", type: "string" })
       expect(hash[:attributes]["integer_attr"]).to eq({ value: 42, type: "integer" })
@@ -177,7 +177,7 @@
         user: user
       )
 
-      hash = event.to_hash
+      hash = event.to_h
 
       expect(hash[:attributes]["user.id"]).to eq(123)
       expect(hash[:attributes]["user.name"]).to eq("john_doe")
diff --git a/sentry-ruby/spec/sentry/profiler_spec.rb b/sentry-ruby/spec/sentry/profiler_spec.rb
@@ -179,7 +179,7 @@
       end
 
       it 'returns empty' do
-        expect(subject.to_hash).to eq({})
+        expect(subject.to_h).to eq({})
       end
 
       it 'records lost event' do
diff --git a/sentry-ruby/spec/sentry/scope_spec.rb b/sentry-ruby/spec/sentry/scope_spec.rb
@@ -246,7 +246,7 @@
 
         scope.apply_to_event(log_event)
 
-        log_hash = log_event.to_hash
+        log_hash = log_event.to_h
 
         expect(log_hash[:attributes]["user.id"]).to eq(123)
         expect(log_hash[:attributes]["user.name"]).to eq("john_doe")
@@ -257,7 +257,7 @@
         scope = described_class.new
         scope.apply_to_event(log_event)
 
-        log_hash = log_event.to_hash
+        log_hash = log_event.to_h
 
         expect(log_hash[:attributes]).not_to have_key("user.id")
         expect(log_hash[:attributes]).not_to have_key("user.name")
diff --git a/sentry-ruby/spec/sentry/transport_spec.rb b/sentry-ruby/spec/sentry/transport_spec.rb
@@ -260,7 +260,7 @@
             item_count: log_events.size,
             content_type: "application/vnd.sentry.items.log+json"
           },
-          { items: log_events.map(&:to_hash) }
+          { items: log_events.map(&:to_h) }
         )
 
         envelope
@@ -309,7 +309,7 @@
 
       it "gracefully removes bad encoding breadcrumb message" do
         expect do
-          JSON.generate(event.to_hash)
+          JSON.generate(event.to_h)
         end.not_to raise_error
       end
     end
@@ -582,7 +582,7 @@
             item_count: log_events.size,
             content_type: "application/vnd.sentry.items.log+json"
           },
-          { items: log_events.map(&:to_hash) }
+          { items: log_events.map(&:to_h) }
         )
 
         envelope
diff --git a/sentry-ruby/spec/sentry/vernier/profiler_spec.rb b/sentry-ruby/spec/sentry/vernier/profiler_spec.rb
@@ -147,7 +147,7 @@
     end
   end
 
-  describe "#to_hash" do
+  describe "#to_h" do
     let (:transport) { Sentry.get_current_client.transport }
 
     it "records lost event if not sampled" do
@@ -157,7 +157,7 @@
       profiler.start
       profiler.set_initial_sample_decision(false)
 
-      expect(profiler.to_hash).to eq({})
+      expect(profiler.to_h).to eq({})
     end
   end
 
@@ -166,9 +166,9 @@
       profiler.set_initial_sample_decision(true)
     end
 
-    describe '#to_hash' do
+    describe '#to_h' do
       it "returns empty hash if not started" do
-        expect(profiler.to_hash).to eq({})
+        expect(profiler.to_h).to eq({})
       end
 
       context 'with single-thread profiled code' do
@@ -179,7 +179,7 @@
         end
 
         it 'has correct frames' do
-          frames = profiler.to_hash[:profile][:frames]
+          frames = profiler.to_h[:profile][:frames]
 
           foo_frame = frames.find { |f| f[:function] =~ /foo/ }
 
@@ -192,7 +192,7 @@
         end
 
         it 'has correct stacks' do
-          profile = profiler.to_hash[:profile]
+          profile = profiler.to_h[:profile]
           frames = profile[:frames]
           stacks = profile[:stacks]
 
@@ -210,7 +210,7 @@
         end
 
         it 'has correct samples' do
-          profile = profiler.to_hash[:profile]
+          profile = profiler.to_h[:profile]
           samples = profile[:samples]
           last_elapsed = 0
 
@@ -249,7 +249,7 @@
         end
 
         it "has correct thread metadata" do
-          thread_metadata = profiler.to_hash[:profile][:thread_metadata]
+          thread_metadata = profiler.to_h[:profile][:thread_metadata]
 
           main_thread = thread_metadata.values.find { |metadata| metadata[:name].include?("rspec") }
           thread1 = thread_metadata.values.find { |metadata| metadata[:name] == "thread-bar-0" }
@@ -265,7 +265,7 @@
         end
 
         it 'has correct frames', when: { ruby_version?: [:>=, "3.3"], ruby_engine?: "ruby" } do
-          frames = profiler.to_hash[:profile][:frames]
+          frames = profiler.to_h[:profile][:frames]
 
           foo_frame = frames.find { |f| f[:function] =~ /foo/ }
 
@@ -278,7 +278,7 @@
         end
 
         it 'has correct stacks', when: { ruby_version?: [:>=, "3.3"], ruby_engine?: "ruby" } do
-          profile = profiler.to_hash[:profile]
+          profile = profiler.to_h[:profile]
           frames = profile[:frames]
           stacks = profile[:stacks]
 
@@ -296,7 +296,7 @@
         end
 
         it 'has correct samples' do
-          profile = profiler.to_hash[:profile]
+          profile = profiler.to_h[:profile]
           samples = profile[:samples]
 
           samples.group_by { |sample| sample[:thread_id] }.each do |thread_id, thread_samples|
