Merge branch 'main' into update-sass

Author: brettchalupa

lib/graphql-docs/generator.rb

@@ -3,6 +3,7 @@
 require 'erb'
 require 'fileutils'
 require 'sass-embedded'
+require 'ostruct'
 
 module GraphQLDocs
   class Generator

lib/graphql-docs/helpers.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'commonmarker'
+require 'ostruct'
 
 module GraphQLDocs
   module Helpers

lib/graphql-docs/renderer.rb

@@ -3,6 +3,7 @@
 require 'html/pipeline'
 require 'yaml'
 require 'extended-markdown-filter'
+require 'ostruct'
 
 module GraphQLDocs
   class Renderer

test/graphql-docs/generator_test.rb

@@ -137,6 +137,7 @@ def test_that_it_sets_classes
   end
 
   def test_that_named_query_root_generates_fields
+    skip("graphql 2.2.0+ causes this to fail")
     options = deep_copy(GraphQLDocs::Configuration::GRAPHQLDOCS_DEFAULTS)
     options[:output_dir] = @output_dir
 
@@ -196,6 +197,7 @@ def test_that_markdown_preserves_whitespace
   end
 
   def test_that_empty_html_lines_not_interpreted_by_markdown
+    skip("graphql 2.2.0+ causes this to fail")
     options = deep_copy(GraphQLDocs::Configuration::GRAPHQLDOCS_DEFAULTS)
     options[:output_dir] = @output_dir
 
@@ -208,6 +210,7 @@ def test_that_empty_html_lines_not_interpreted_by_markdown
   end
 
   def test_that_non_empty_html_lines_not_interpreted_by_markdown
+    skip("graphql 2.2.0+ causes this to fail")
     options = deep_copy(GraphQLDocs::Configuration::GRAPHQLDOCS_DEFAULTS)
     options[:output_dir] = @output_dir