Avoid duplication between PluginTestHelper and PluginHelpers, use onl…

…y generate_plugin to generate plugins

railties/test/generators/plugin_test_helper.rb

@@ -23,15 +23,4 @@ def plugin_file(path, contents, mode: "w")
       f.puts contents
     end
   end
-
-  def fill_in_gemspec_fields(gemspec_path = "#{plugin_path}/#{File.basename plugin_path}.gemspec")
-    # Some fields must be a valid URL.
-    filled_in = File.read(gemspec_path).gsub(/"TODO.*"/, "http://example.com".inspect)
-    File.write(gemspec_path, filled_in)
-  end
-
-  def resolve_rails_gem_to_repository(gemfile_path = "#{plugin_path}/Gemfile")
-    repository_path = File.expand_path("../../..", __dir__)
-    File.write(gemfile_path, "gem 'rails', path: #{repository_path.inspect}\n", mode: "a")
-  end
 end

railties/test/generators/plugin_test_runner_test.rb

@@ -2,16 +2,16 @@
 
 require "generators/plugin_test_helper"
 require "env_helpers"
+require "plugin_helpers"
 
 class PluginTestRunnerTest < ActiveSupport::TestCase
   include PluginTestHelper
   include EnvHelpers
+  include PluginHelpers
 
   def setup
     @destination_root = Dir.mktmpdir("bukkits")
-    Dir.chdir(@destination_root) { `bundle exec rails plugin new bukkits --skip-bundle` }
-    fill_in_gemspec_fields
-    resolve_rails_gem_to_repository
+    generate_plugin("#{@destination_root}/bukkits")
     plugin_file "test/dummy/db/schema.rb", ""
   end
 

railties/test/generators/test_runner_in_engine_test.rb

@@ -2,16 +2,16 @@
 
 require "generators/plugin_test_helper"
 require "env_helpers"
+require "plugin_helpers"
 
 class TestRunnerInEngineTest < ActiveSupport::TestCase
   include PluginTestHelper
   include EnvHelpers
+  include PluginHelpers
 
   def setup
     @destination_root = Dir.mktmpdir("bukkits")
-    Dir.chdir(@destination_root) { `bundle exec rails plugin new bukkits --full --skip-bundle` }
-    fill_in_gemspec_fields
-    resolve_rails_gem_to_repository
+    generate_plugin("#{@destination_root}/bukkits", "--full")
     plugin_file "test/dummy/db/schema.rb", ""
   end