diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-07-14 08:44:30 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-07-14 08:44:30 +0200 |
| commit | 368b9938ec9d8fbb8146e65c1edf744d32d207c9 (patch) | |
| tree | 9ecbb530bbd0b5a13bef06deb3264b11fea3b933 /railties/lib/rails | |
| parent | 908bc79729fdb3cc2acbd346d9ed34c9286d57cc (diff) | |
| parent | 824246f66b21c89d4a646a3cb73e46134d97469d (diff) | |
| download | rails-368b9938ec9d8fbb8146e65c1edf744d32d207c9.tar.gz rails-368b9938ec9d8fbb8146e65c1edf744d32d207c9.tar.bz2 rails-368b9938ec9d8fbb8146e65c1edf744d32d207c9.zip | |
Merge pull request #20870 from y-yagi/test_runner_inside_engine
make test runner work correctly inside engine
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/commands/test.rb | 6 | ||||
| -rw-r--r-- | railties/lib/rails/engine/commands.rb | 6 |
2 files changed, 9 insertions, 3 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. |