clean up resolver version testing. (#180)

Author: gmac

lib/graphql/stitching/type_resolver.rb

@@ -10,6 +10,13 @@ class TypeResolver
       extend ArgumentsParser
       extend KeysParser
 
+      class << self
+        # only intended for testing...
+        def use_static_version?
+          @use_static_version ||= false
+        end
+      end
+
       # location name providing the resolver query.
       attr_reader :location
 
@@ -47,7 +54,11 @@ def list?
       end
 
       def version
-        @version ||= Stitching.digest.call("#{Stitching::VERSION}/#{as_json.to_json}")
+        @version ||= if self.class.use_static_version?
+          [location, field, key.to_definition, type_name].join(".")
+        else
+          Stitching.digest.call("#{Stitching::VERSION}/#{as_json.to_json}")
+        end
       end
 
       def ==(other)

test/graphql/stitching/planner/plan_abstracts_test.rb

@@ -38,10 +38,9 @@ def setup
   end
 
   def test_expands_interface_selections_for_target_location
-    plan = GraphQL::Stitching::Request.new(
-      @supergraph,
-      %|{ buyable(id:"1") { id name price } }|,
-    ).plan
+    plan = with_static_resolver_version do
+      GraphQL::Stitching::Request.new(@supergraph, %|{ buyable(id:"1") { id name price } }|).plan
+    end
 
     expected_root_selection = %|
       {
@@ -77,11 +76,7 @@ def test_expands_interface_selections_for_target_location
       selections: "{ name price }",
       path: ["buyable"],
       if_type: "Product",
-      resolver: resolver_version("Product", {
-        location: "a",
-        field: "products",
-        key: "id",
-      }),
+      resolver: "a.products.id.Product",
     }
   end
 
@@ -224,7 +219,9 @@ def test_plan_merged_union_types
 
     @supergraph = compose_definitions({ "a" => a, "b" => b, "c" => c })
 
-    plan = GraphQL::Stitching::Request.new(@supergraph, document).plan
+    plan = with_static_resolver_version do
+      GraphQL::Stitching::Request.new(@supergraph, document).plan
+    end
 
     expected_root_selection = %|
       {
@@ -260,10 +257,7 @@ def test_plan_merged_union_types
       selections: "{ b }",
       path: ["fruit"],
       if_type: "Apple",
-      resolver: resolver_version("Apple", {
-        location: "b",
-        key: "id",
-      }),
+      resolver: "b.apple.id.Apple",
     }
 
     assert_keys plan.ops[2].as_json, {
@@ -272,10 +266,7 @@ def test_plan_merged_union_types
       selections: "{ c }",
       path: ["fruit"],
       if_type: "Apple",
-      resolver: resolver_version("Apple", {
-        location: "c",
-        key: "id",
-      }),
+      resolver: "c.apple.id.Apple",
     }
 
     assert_keys plan.ops[3].as_json, {
@@ -284,19 +275,7 @@ def test_plan_merged_union_types
       selections: "{ b }",
       path: ["fruit"],
       if_type: "Banana",
-      resolver: resolver_version("Banana", {
-        location: "b",
-        key: "id",
-      }),
+      resolver: "b.banana.id.Banana",
     }
   end
-
-  private
-
-  def resolver_version(type_name, criteria)
-    @supergraph.resolvers[type_name].find do |resolver|
-      json = resolver.as_json
-      criteria.all? { |k, v| json[k] == v }
-    end.version
-  end
 end

test/graphql/stitching/resolver/arguments_test.rb renamed to test/graphql/stitching/type_resolver/arguments_test.rb

@@ -135,6 +135,13 @@ def extract_types_of_kind(schema, kind)
   schema.types.values.select { _1.kind.object? && !_1.graphql_name.start_with?("__") }
 end
 
+def with_static_resolver_version
+  GraphQL::Stitching::TypeResolver.instance_variable_set(:@use_static_version, true)
+  yield
+ensure
+  GraphQL::Stitching::TypeResolver.instance_variable_set(:@use_static_version, false)
+end
+
 def assert_error(pattern, klass=nil)
   begin
     yield

test/graphql/stitching/resolver/keys_test.rb renamed to test/graphql/stitching/type_resolver/keys_test.rb

@@ -77,4 +77,19 @@ def test_sorted_selection_matcher_matches_fragment_spreads
     refute matcher.match?(%|{ ...A ...B ...C }|)
     refute matcher.match?(%|{ ...A ... C }|)
   end
+
+  def test_use_static_version_is_false_by_default
+    assert_equal false, GraphQL::Stitching::TypeResolver.use_static_version?
+  end
+
+  def test_use_static_version_is_true_in_helper_block
+    begin
+      with_static_resolver_version do
+        assert_equal true, GraphQL::Stitching::TypeResolver.use_static_version?
+        raise "block interrupt"
+      end
+    rescue
+      assert_equal false, GraphQL::Stitching::TypeResolver.use_static_version?
+    end
+  end
 end