Fix handling of skips from lazy values

Author: rmosolgo

lib/graphql/execution/interpreter/runtime.rb

@@ -517,6 +517,15 @@ def continue_value(path, value, parent_type, field, is_non_null, ast_node, resul
               end
               continue_value(path, next_value, parent_type, field, is_non_null, ast_node, result_name, selection_result)
             elsif GraphQL::Execution::Execute::SKIP == value
+              # It's possible a lazy was already written here
+              case selection_result
+              when Hash
+                selection_result.delete(result_name)
+              when Array
+                selection_result.delete_at(result_name)
+              else
+                raise "Invariant: unexpected result class #{selection_result.class} (#{selection_result.inspect})"
+              end
               HALT
             else
               # What could this actually _be_? Anyhow,

spec/graphql/execution/interpreter_spec.rb

@@ -587,21 +587,19 @@ class Subscription < GraphQL::Schema::Object
       lazy_resolve Proc, :call
     end
 
-    focus
     it "skips properly" do
       res = LazySkipSchema.execute("{ skip }")
       assert_equal({}, res["data"])
       refute res.key?("errors")
-      # This failed on 1.12.10, too
-      # res = LazySkipSchema.execute("{ lazySkip }")
-      # pp res
-      # assert_equal({}, res["data"])
-      # refute res.key?("errors")
+
+      res = LazySkipSchema.execute("{ lazySkip }")
+      assert_equal({}, res["data"])
+      refute res.key?("errors")
 
       res = LazySkipSchema.execute("subscription { nothing { nothing } }")
-      pp res
       assert_equal({}, res["data"])
       refute res.key?("errors")
+      # Make sure an update works properly
       LazySkipSchema.subscriptions.trigger(:nothing, {}, :nothing_at_all)
       key, updates = LazySkipSchema.subscriptions.deliveries.first
       assert_equal "nothing_at_all", updates[0]["data"]["nothing"]["nothing"]