Merge pull request rails#20870 from y-yagi/test_runner_inside_engine

make test runner work correctly inside engine

Author: kaspth

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)

railties/lib/rails/engine/commands.rb

@@ -2,7 +2,8 @@
 
 aliases = {
   "g" => "generate",
-  "d" => "destroy"
+  "d" => "destroy",
+  "t" => "test"
 }
 
 command = ARGV.shift
@@ -12,7 +13,7 @@
 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 @@
 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.
 

railties/test/generators/scaffold_controller_generator_test.rb

@@ -182,7 +182,7 @@ def test_controller_tests_pass_by_default_inside_mountable_engine
 
     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 @@ def test_controller_tests_pass_by_default_inside_full_engine
 
     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
 

railties/test/generators/scaffold_generator_test.rb

@@ -488,7 +488,7 @@ def test_scaffold_tests_pass_by_default_inside_mountable_engine
         `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 @@ def test_scaffold_tests_pass_by_default_inside_full_engine
         `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