3 files changed, 48 insertions, 1 deletions
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 2105585272..0d24821ff6 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -114,7 +114,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_ensure_that_tests_works_in_full_mode
-    run_generator [destination_root, "--full"]
+    run_generator [destination_root, "--full", "--skip_active_record"]
     FileUtils.cd destination_root
     `bundle install`
     assert_match /2 tests, 2 assertions, 0 failures, 0 errors/, `bundle exec rake test`
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index d117656fbd..9e6169721b 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -113,6 +113,15 @@ module SharedGeneratorTests
     assert_match /It works!/, silence(:stdout){ generator.invoke_all }
   end
 
+  def test_template_is_executed_when_supplied_an_https_path
+    path = "https://gist.github.com/103208.txt"
+    template = %{ say "It works!" }
+    template.instance_eval "def read; self; end" # Make the string respond to read
+
+    generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
+    assert_match /It works!/, silence(:stdout){ generator.invoke_all }
+  end
+
   def test_dev_option
     generator([destination_root], :dev => true).expects(:run).with("#{@bundle_command} install")
     silence(:stdout){ generator.invoke_all }
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 701b6816c8..05bd0c36cd 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -683,5 +683,43 @@ module RailtiesTest
       app_generators = Rails.application.config.generators.options[:rails]
       assert_equal :test_unit    , app_generators[:test_framework]
     end
+
+    test "do not create table_name_prefix method if it already exists" do
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        module Bukkits
+          def self.table_name_prefix
+            "foo"
+          end
+
+          class Engine < ::Rails::Engine
+            isolate_namespace(Bukkits)
+          end
+        end
+      RUBY
+
+      boot_rails
+      require "#{rails_root}/config/environment"
+
+      assert_equal "foo", Bukkits.table_name_prefix
+    end
+
+    test "fetching engine by path" do
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        module Bukkits
+          class Engine < ::Rails::Engine
+          end
+        end
+      RUBY
+
+      boot_rails
+      require "#{rails_root}/config/environment"
+
+      assert_equal Bukkits::Engine.instance, Rails::Engine.find(@plugin.path)
+
+      # check expanding paths
+      engine_dir = @plugin.path.chomp("/").split("/").last
+      engine_path = File.join(@plugin.path, '..', engine_dir)
+      assert_equal Bukkits::Engine.instance, Rails::Engine.find(engine_path)
+    end
   end
 end