ci: Update test reset code for GraphQL-Ruby 2.1.3 (#691)

Fixes #689
open-telemetry · Oct 13, 2023 · dd90f32 · dd90f32
1 parent 20e1cd0
commit dd90f32
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb
@@ -97,8 +97,7 @@
 
         after do
           # Reset various instance variables to clear state between tests
-          SomeOtherGraphQLAppSchema.instance_variable_set(:@own_tracers, [])
-          SomeOtherGraphQLAppSchema.instance_variable_set(:@own_plugins, SomeOtherGraphQLAppSchema.plugins[0..1])
+          [GraphQL::Schema, SomeOtherGraphQLAppSchema, SomeGraphQLAppSchema].each(&:_reset_tracer_for_testing)
         end
 
         it 'traces the provided schemas' do

diff --git a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_tracer_test.rb b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_tracer_test.rb
@@ -97,13 +97,11 @@
 
         after do
           # Reset various instance variables to clear state between tests
-          SomeOtherGraphQLAppSchema.instance_variable_set(:@own_tracers, [])
-          SomeOtherGraphQLAppSchema.instance_variable_set(:@own_plugins, SomeOtherGraphQLAppSchema.plugins[0..1])
+          [GraphQL::Schema, SomeOtherGraphQLAppSchema, SomeGraphQLAppSchema].each(&:_reset_tracer_for_testing)
         end
 
         it 'traces the provided schemas' do
           SomeOtherGraphQLAppSchema.execute('query SimpleQuery{ __typename }')
-
           _(spans.size).must_equal(8)
         end
 

diff --git a/instrumentation/graphql/test/test_helper.rb b/instrumentation/graphql/test/test_helper.rb
@@ -25,7 +25,7 @@ module SchemaTestPatches
   # Reseting @graphql_definition is needed for tests running against version `1.9.x`
   # Other variables are used by ~> 2.0.19
   def _reset_tracer_for_testing
-    %w[own_tracers trace_modes trace_class tracers graphql_definition].each do |ivar|
+    %w[own_tracers trace_modes trace_class tracers graphql_definition own_trace_modes].each do |ivar|
       remove_instance_variable("@#{ivar}") if instance_variable_defined?("@#{ivar}")
     end
   end