1 files changed, 15 insertions, 50 deletions

diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index e83d54890a..27b2fc8955 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -5,7 +5,7 @@ module SharedGeneratorTests
   def setup
     Rails.application = TestApp::Application
     super
-    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
+    Rails::Generators::AppGenerator.instance_variable_set("@desc", nil)
 
     Kernel::silence_warnings do
       Thor::Base.shell.send(:attr_accessor, :always_force)
@@ -16,7 +16,7 @@ module SharedGeneratorTests
 
   def teardown
     super
-    Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
+    Rails::Generators::AppGenerator.instance_variable_set("@desc", nil)
     Rails.application = TestApp::Application.instance
   end
 
@@ -26,37 +26,13 @@ module SharedGeneratorTests
     default_files.each { |path| assert_file path }
   end
 
-  def assert_generates_with_bundler(options = {})
-    generator([destination_root], options)
-
-    command_check = -> command do
-      @install_called ||= 0
-
-      case command
-      when 'install'
-        @install_called += 1
-        assert_equal 1, @install_called, "install expected to be called once, but was called #{@install_called} times"
-      when 'exec spring binstub --all'
-        # Called when running tests with spring, let through unscathed.
-      end
-    end
-
-    generator.stub :bundle_command, command_check do
-      quietly { generator.invoke_all }
-    end
-  end
-
-  def test_generation_runs_bundle_install
-    assert_generates_with_bundler
-  end
-
   def test_plugin_new_generate_pretend
     run_generator ["testapp", "--pretend"]
-    default_files.each{ |path| assert_no_file File.join("testapp",path) }
+    default_files.each { |path| assert_no_file File.join("testapp",path) }
   end
 
   def test_invalid_database_option_raises_an_error
-    content = capture(:stderr){ run_generator([destination_root, "-d", "unknown"]) }
+    content = capture(:stderr) { run_generator([destination_root, "-d", "unknown"]) }
     assert_match(/Invalid value for \-\-database option/, content)
   end
 
@@ -68,14 +44,14 @@ module SharedGeneratorTests
   def test_name_collision_raises_an_error
     reserved_words = %w[application destroy plugin runner test]
     reserved_words.each do |reserved|
-      content = capture(:stderr){ run_generator [File.join(destination_root, reserved)] }
+      content = capture(:stderr) { run_generator [File.join(destination_root, reserved)] }
       assert_match(/Invalid \w+ name #{reserved}. Please give a name which does not match one of the reserved rails words: application, destroy, plugin, runner, test\n/, content)
     end
   end
 
   def test_name_raises_an_error_if_name_already_used_constant
     %w{ String Hash Class Module Set Symbol }.each do |ruby_class|
-      content = capture(:stderr){ run_generator [File.join(destination_root, ruby_class)] }
+      content = capture(:stderr) { run_generator [File.join(destination_root, ruby_class)] }
       assert_match(/Invalid \w+ name #{ruby_class}, constant #{ruby_class} is already in use. Please choose another \w+ name.\n/, content)
     end
   end
@@ -92,7 +68,7 @@ module SharedGeneratorTests
 
   def test_template_raises_an_error_with_invalid_path
     quietly do
-      content = capture(:stderr){ run_generator([destination_root, "-m", "non/existent/path"]) }
+      content = capture(:stderr) { run_generator([destination_root, "-m", "non/existent/path"]) }
 
       assert_match(/The template \[.*\] could not be loaded/, content)
       assert_match(/non\/existent\/path/, content)
@@ -105,7 +81,7 @@ module SharedGeneratorTests
     template.instance_eval "def read; self; end" # Make the string respond to read
 
     check_open = -> *args do
-      assert_equal [ path, 'Accept' => 'application/x-thor-template' ], args
+      assert_equal [ path, "Accept" => "application/x-thor-template" ], args
       template
     end
 
@@ -114,21 +90,10 @@ module SharedGeneratorTests
     end
   end
 
-  def test_dev_option
-    assert_generates_with_bundler dev: true
-    rails_path = File.expand_path('../../..', Rails.root)
-    assert_file 'Gemfile', /^gem\s+["']rails["'],\s+path:\s+["']#{Regexp.escape(rails_path)}["']$/
-  end
-
-  def test_edge_option
-    assert_generates_with_bundler edge: true
-    assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["']$}
-  end
-
   def test_skip_gemfile
     assert_not_called(generator([destination_root], skip_gemfile: true), :bundle_command) do
       quietly { generator.invoke_all }
-      assert_no_file 'Gemfile'
+      assert_no_file "Gemfile"
     end
   end
 
@@ -137,22 +102,22 @@ module SharedGeneratorTests
       quietly { generator.invoke_all }
       # skip_bundle is only about running bundle install, ensure the Gemfile is still
       # generated.
-      assert_file 'Gemfile'
+      assert_file "Gemfile"
     end
   end
 
   def test_skip_git
-    run_generator [destination_root, '--skip-git', '--full']
-    assert_no_file('.gitignore')
+    run_generator [destination_root, "--skip-git", "--full"]
+    assert_no_file(".gitignore")
   end
 
   def test_skip_keeps
-    run_generator [destination_root, '--skip-keeps', '--full']
+    run_generator [destination_root, "--skip-keeps", "--full"]
 
-    assert_file '.gitignore' do |content|
+    assert_file ".gitignore" do |content|
       assert_no_match(/\.keep/, content)
     end
 
-    assert_no_file('app/models/concerns/.keep')
+    assert_no_file("app/models/concerns/.keep")
   end
 end