3 files changed, 35 insertions, 0 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 317e73245c..e8c8de9f73 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -271,5 +271,16 @@ module ApplicationTests
         end
       end
     end
+
+    def test_template_load_initializers
+      app_file "config/initializers/dummy.rb", "puts 'Hello, World!'"
+      app_file "template.rb", ""
+
+      output = Dir.chdir(app_path) do
+        `bundle exec rake rails:template LOCATION=template.rb`
+      end
+
+      assert_match(/Hello, World!/, output)
+    end
   end
 end
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 932cd75bcb..b2fc3a2a4f 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -355,6 +355,18 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     FileUtils.rm gemfile_path
   end
 
+  def test_generating_controller_inside_mountable_engine
+    run_generator [destination_root, "--mountable"]
+
+    capture(:stdout) do
+      `#{destination_root}/bin/rails g controller admin/dashboard foo`
+    end
+
+    assert_file "config/routes.rb" do |contents|
+      assert_match(/namespace :admin/, contents)
+      assert_no_match(/namespace :bukkit/, contents)
+    end
+  end
 
 protected
   def action(*args, &block)
diff --git a/railties/test/version_test.rb b/railties/test/version_test.rb
new file mode 100644
index 0000000000..f270d8f0c9
--- /dev/null
+++ b/railties/test/version_test.rb
@@ -0,0 +1,12 @@
+require 'abstract_unit'
+
+class VersionTest < ActiveSupport::TestCase
+  def test_rails_version_returns_a_string
+    assert Rails.version.is_a? String
+  end
+
+  def test_rails_gem_version_returns_a_correct_gem_version_object
+    assert Rails.gem_version.is_a? Gem::Version
+    assert_equal Rails.version, Rails.gem_version.to_s
+  end
+end