From ffea529608356e0ab8f33237f9d21221c62ce647 Mon Sep 17 00:00:00 2001 From: Hannah Ramadan <76922290+hannahramadan@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:30:45 -0700 Subject: [PATCH] Stripe testing update (#2891) * Update Stripe test Co-authored-by: James Bunch --------- Co-authored-by: James Bunch --- test/multiverse/suites/stripe/Envfile | 3 +-- .../suites/stripe/stripe_instrumentation_test.rb | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/test/multiverse/suites/stripe/Envfile b/test/multiverse/suites/stripe/Envfile index 77f2812d43..ef6692375d 100644 --- a/test/multiverse/suites/stripe/Envfile +++ b/test/multiverse/suites/stripe/Envfile @@ -7,8 +7,7 @@ instrumentation_methods :chain STRIPE_VERSIONS = [ - # TODO: support Stripe v13+ https://github.com/newrelic/newrelic-ruby-agent/issues/2884 - # [nil, 2.4], + [nil, 2.4], ['12.6.0', 2.4], ['5.38.0', 2.4] ] diff --git a/test/multiverse/suites/stripe/stripe_instrumentation_test.rb b/test/multiverse/suites/stripe/stripe_instrumentation_test.rb index c6b5bd207e..db6c0dc991 100644 --- a/test/multiverse/suites/stripe/stripe_instrumentation_test.rb +++ b/test/multiverse/suites/stripe/stripe_instrumentation_test.rb @@ -199,9 +199,19 @@ def stripe_segment_from_transaction(txn) end def with_stubbed_connection_manager(&block) - Stripe::StripeClient.stub(:default_connection_manager, @connection) do - @connection.stub(:execute_request, @response) do - yield + # Stripe moved StripeClient and requestor logic to APIRequestor in v13.0.0 + # https://github.com/stripe/stripe-ruby/pull/1458 + if Gem::Version.new(Stripe::VERSION) >= Gem::Version.new('13.0.0') + Stripe::APIRequestor.stub(:default_connection_manager, @connection) do + @connection.stub(:execute_request, @response) do + yield + end + end + else + Stripe::StripeClient.stub(:default_connection_manager, @connection) do + @connection.stub(:execute_request, @response) do + yield + end end end end