1 files changed, 3 insertions, 21 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index c456347e5c..a15943dfc6 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -285,17 +285,10 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_inclusion_of_ruby_debug
+  def test_inclusion_of_ruby_debug19
     run_generator
     assert_file "Gemfile" do |contents|
-      assert_match(/gem 'ruby-debug'/, contents) if RUBY_VERSION < '1.9'
-    end
-  end
-
-  def test_inclusion_of_ruby_debug19_if_ruby19
-    run_generator
-    assert_file "Gemfile" do |contents|
-      assert_match(/gem 'ruby-debug19', :require => 'ruby-debug'/, contents) unless RUBY_VERSION < '1.9'
+      assert_match(/gem 'ruby-debug19', :require => 'ruby-debug'/, contents)
     end
   end
 
@@ -337,18 +330,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
   def test_new_hash_style
     run_generator [destination_root]
     assert_file "config/initializers/session_store.rb" do |file|
-      if RUBY_VERSION < "1.9"
-        assert_match(/config.session_store :cookie_store, :key => '_.+_session'/, file)
-      else
-        assert_match(/config.session_store :cookie_store, key: '_.+_session'/, file)
-      end
-    end
-  end
-
-  def test_force_old_style_hash
-    run_generator [destination_root, "--old-style-hash"]
-    assert_file "config/initializers/session_store.rb" do |file|
-      assert_match(/config.session_store :cookie_store, :key => '_.+_session'/, file)
+      assert_match(/config.session_store :cookie_store, key: '_.+_session'/, file)
     end
   end