Merge pull request #3441 from rmosolgo/generator-fixes

Don't re-add graphiql-rails when installed twice

Author: Robert Mosolgo

lib/generators/graphql/install_generator.rb

@@ -122,7 +122,7 @@ def create_folder_structure
         if options.api?
           say("Skipped graphiql, as this rails project is API only")
           say("  You may wish to use GraphiQL.app for development: https://github.com/skevy/graphiql-app")
-        elsif !options[:skip_graphiql]
+        elsif !options[:skip_graphiql] && !File.read(Rails.root.join("Gemfile")).include?("graphiql-rails")
           gem("graphiql-rails", group: :development)
 
           # This is a little cheat just to get cleaner shell output:

spec/integration/rails/generators/graphql/install_generator_spec.rb

@@ -121,6 +121,14 @@ module BaseInterface
 end
 RUBY
     assert_file "app/graphql/types/base_interface.rb", expected_base_interface
+
+    # Run it again and make sure the gemfile only contains graphiql-rails once
+    FileUtils.cd(File.join(destination_root)) do
+      `rails g graphql:install --relay false`
+    end
+    assert_file "Gemfile" do |contents|
+      assert_equal 1, contents.scan(/graphiql-rails/).length
+    end
   end
 
   test "it allows for a user-specified install directory" do