make test runner work correctly inside engine

4 files changed, 13 insertions, 7 deletions

diff --git a/railties/lib/rails/commands/test.rb b/railties/lib/rails/commands/test.rb
index fe5307788a..dd069f081f 100644
--- a/railties/lib/rails/commands/test.rb
+++ b/railties/lib/rails/commands/test.rb
@@ -1,5 +1,9 @@
 require "rails/test_unit/minitest_plugin"
 
-$: << File.expand_path("../../test", APP_PATH)
+if defined?(ENGINE_ROOT)
+  $: << File.expand_path('test', ENGINE_ROOT)
+else
+  $: << File.expand_path('../../test', APP_PATH)
+end
 
 exit Minitest.run(ARGV)
diff --git a/railties/lib/rails/engine/commands.rb b/railties/lib/rails/engine/commands.rb
index f39f926109..a6d87b78e4 100644
--- a/railties/lib/rails/engine/commands.rb
+++ b/railties/lib/rails/engine/commands.rb
@@ -2,7 +2,8 @@ ARGV << '--help' if ARGV.empty?
 
 aliases = {
   "g" => "generate",
-  "d" => "destroy"
+  "d" => "destroy",
+  "t" => "test"
 }
 
 command = ARGV.shift
@@ -12,7 +13,7 @@ require ENGINE_PATH
 engine = ::Rails::Engine.find(ENGINE_ROOT)
 
 case command
-when 'generate', 'destroy'
+when 'generate', 'destroy', 'test'
   require 'rails/generators'
   Rails::Generators.namespace = engine.railtie_namespace
   engine.load_generators
@@ -30,6 +31,7 @@ Usage: rails COMMAND [ARGS]
 The common Rails commands available for engines are:
  generate    Generate new code (short-cut alias: "g")
  destroy     Undo code generated with "generate" (short-cut alias: "d")
+ test        Run tests (short-cut alias: "t")
 
 All commands can be run with -h for more information.
 
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 648b8d9325..95ef853a11 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -182,7 +182,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
 
     Dir.chdir(engine_path) do
       quietly { `bin/rails g controller dashboard foo` }
-      assert_match(/2 runs, 2 assertions, 0 failures, 0 errors/, `bundle exec rake test 2>&1`)
+      assert_match(/2 runs, 2 assertions, 0 failures, 0 errors/, `bin/rails test 2>&1`)
     end
   end
 
@@ -193,7 +193,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
 
     Dir.chdir(engine_path) do
       quietly { `bin/rails g controller dashboard foo` }
-      assert_match(/2 runs, 2 assertions, 0 failures, 0 errors/, `bundle exec rake test 2>&1`)
+      assert_match(/2 runs, 2 assertions, 0 failures, 0 errors/, `bin/rails test 2>&1`)
     end
   end
 
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index debf1140ab..a853bfbe21 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -488,7 +488,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
         `bin/rails g scaffold User name:string age:integer;
         bundle exec rake db:migrate`
       end
-      assert_match(/8 runs, 13 assertions, 0 failures, 0 errors/, `bundle exec rake test 2>&1`)
+      assert_match(/8 runs, 13 assertions, 0 failures, 0 errors/, `bin/rails test 2>&1`)
     end
   end
 
@@ -502,7 +502,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
         `bin/rails g scaffold User name:string age:integer;
         bundle exec rake db:migrate`
       end
-      assert_match(/8 runs, 13 assertions, 0 failures, 0 errors/, `bundle exec rake test 2>&1`)
+      assert_match(/8 runs, 13 assertions, 0 failures, 0 errors/, `bin/rails test 2>&1`)
     end
   end
 end