3 files changed, 23 insertions, 8 deletions
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index a8c8fcd5b7..bc086c5986 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -67,6 +67,14 @@ class ActionsTest < Rails::Generators::TestCase
     assert_file 'Gemfile', /^gem "rspec-rails"$/
   end
 
+  def test_gem_should_include_options
+    run_generator
+
+    action :gem, 'rspec', github: 'dchelimsky/rspec', tag: '1.2.9.rc1'
+
+    assert_file 'Gemfile', /gem "rspec", github: "dchelimsky\/rspec", tag: "1\.2\.9\.rc1"/
+  end
+
   def test_gem_group_should_wrap_gems_in_a_group
     run_generator
 
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 6f00fc5d26..09169ef2d2 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -20,8 +20,14 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
 
   def test_namespaced_controller_skeleton_is_created
     run_generator
-    assert_file "app/controllers/test_app/account_controller.rb", /module TestApp/, /  class AccountController < ApplicationController/
-    assert_file "test/functional/test_app/account_controller_test.rb", /module TestApp/, /  class AccountControllerTest/
+    assert_file "app/controllers/test_app/account_controller.rb",
+                /require_dependency "test_app\/application_controller"/,
+                /module TestApp/,
+                /  class AccountController < ApplicationController/
+
+    assert_file "test/functional/test_app/account_controller_test.rb",
+                /module TestApp/,
+                /  class AccountControllerTest/
   end
 
   def test_skipping_namespace
@@ -66,7 +72,7 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
     run_generator
     assert_file "app/controllers/test_app/account_controller.rb" do |content|
       content.split("\n").each do |line|
-        assert_no_match line, /^\s+$/, "Don't indent blank lines"
+        assert_no_match(/^\s+$/, line, "Don't indent blank lines")
       end
     end
   end
@@ -227,9 +233,10 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
     end
 
     # Controller
-    assert_file "app/controllers/test_app/product_lines_controller.rb" do |content|
-      assert_match(/module TestApp\n  class ProductLinesController < ApplicationController/, content)
-    end
+    assert_file "app/controllers/test_app/product_lines_controller.rb",
+                /require_dependency "test_app\/application_controller"/,
+                /module TestApp/,
+                /class ProductLinesController < ApplicationController/
 
     assert_file "test/functional/test_app/product_lines_controller_test.rb",
                 /module TestApp\n  class ProductLinesControllerTest < ActionController::TestCase/
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 51374e5f3f..58740978aa 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -279,7 +279,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
 
     run_generator [destination_root]
 
-    assert_file gemfile_path, /gem 'bukkits', :path => 'tmp\/bukkits'/
+    assert_file gemfile_path, /gem 'bukkits', path: 'tmp\/bukkits'/
   ensure
     Object.send(:remove_const, 'APP_PATH')
     FileUtils.rm gemfile_path
@@ -294,7 +294,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     run_generator [destination_root, "--skip-gemfile-entry"]
 
     assert_file gemfile_path do |contents|
-      assert_no_match(/gem 'bukkits', :path => 'tmp\/bukkits'/, contents)
+      assert_no_match(/gem 'bukkits', path: 'tmp\/bukkits'/, contents)
     end
   ensure
     Object.send(:remove_const, 'APP_PATH')