Try to fix generators loading and warnings

rmosolgo · Feb 16, 2021 · 4abc185 · 4abc185
1 parent a0b6e48
commit 4abc185
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2 deletions.
diff --git a/lib/generators/graphql/install_generator.rb b/lib/generators/graphql/install_generator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'rails/generators'
 require 'rails/generators/base'
 require_relative 'core'
 require_relative 'relay'

diff --git a/lib/generators/graphql/loader_generator.rb b/lib/generators/graphql/loader_generator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'rails/generators'
 require "rails/generators/named_base"
 require_relative "core"
 

diff --git a/lib/generators/graphql/mutation_generator.rb b/lib/generators/graphql/mutation_generator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'rails/generators'
 require 'rails/generators/named_base'
 require_relative 'core'
 

diff --git a/lib/generators/graphql/relay_generator.rb b/lib/generators/graphql/relay_generator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'rails/generators'
 require 'rails/generators/base'
 require_relative 'core'
 require_relative 'relay'

diff --git a/lib/generators/graphql/type_generator.rb b/lib/generators/graphql/type_generator.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'rails/generators'
 require 'rails/generators/base'
 require 'graphql'
 require 'active_support'

diff --git a/spec/integration/rails/generators/graphql/mutation_generator_spec.rb b/spec/integration/rails/generators/graphql/mutation_generator_spec.rb
@@ -11,7 +11,7 @@ def setup(directory = "app/graphql")
     prepare_destination
     FileUtils.cd(File.expand_path("../../../tmp", File.dirname(__FILE__))) do
       `rm -rf dummy`
-      `rails new dummy --skip-active-record --skip-test-unit --skip-spring --skip-bundle`
+      `rails new dummy --skip-active-record --skip-test-unit --skip-spring --skip-bundle --skip-webpack-install`
     end
 
     FileUtils.cd(destination_root) do

diff --git a/spec/integration/rails/generators/graphql/relay_generator_spec.rb b/spec/integration/rails/generators/graphql/relay_generator_spec.rb
@@ -10,7 +10,7 @@ class GraphQLGeneratorsRelayGeneratorTest < Rails::Generators::TestCase
     prepare_destination
 
     FileUtils.cd(File.join(destination_root, '..')) do
-      `rails new dummy --skip-active-record --skip-test-unit --skip-spring --skip-bundle`
+      `rails new dummy --skip-active-record --skip-test-unit --skip-spring --skip-bundle --skip-webpack-install`
 
       FileUtils.cd("dummy") do
         `rails generate graphql:install`