diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-30 15:57:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-30 15:57:49 +0200 |
| commit | 3540e60c385286f3517ff56270b31a91ed3024a3 (patch) | |
| tree | bdfe655c98c808be756d9a58d093688a15391381 /railties | |
| parent | 05731f11d6239b1129c73a79433923c9d1448d3e (diff) | |
| parent | 0348a9e4ae590f26693f27b135d983103f2fa258 (diff) | |
| download | rails-3540e60c385286f3517ff56270b31a91ed3024a3.tar.gz rails-3540e60c385286f3517ff56270b31a91ed3024a3.tar.bz2 rails-3540e60c385286f3517ff56270b31a91ed3024a3.zip | |
Merge pull request #29995 from y-yagi/fix_test_runner_output
Fix test runner's output
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/test_runner_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/plugin_test_runner_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb index 8e0712fca2..82dcfe5200 100644 --- a/railties/test/application/test_runner_test.rb +++ b/railties/test/application/test_runner_test.rb @@ -489,7 +489,7 @@ module ApplicationTests create_test_file :models, "post", pass: false output = run_test_command("test/models/post_test.rb") - assert_match %r{Finished in.*\n\n1 runs, 1 assertions}, output + assert_match %r{Finished in.*\n1 runs, 1 assertions}, output end def test_fail_fast diff --git a/railties/test/generators/plugin_test_runner_test.rb b/railties/test/generators/plugin_test_runner_test.rb index 0bdd2a77d2..f9c860b04a 100644 --- a/railties/test/generators/plugin_test_runner_test.rb +++ b/railties/test/generators/plugin_test_runner_test.rb @@ -71,7 +71,7 @@ class PluginTestRunnerTest < ActiveSupport::TestCase create_test_file "post", pass: false output = run_test_command("test/post_test.rb") - assert_match %r{Finished in.*\n\n1 runs, 1 assertions}, output + assert_match %r{Finished in.*\n1 runs, 1 assertions}, output end def test_fail_fast |