diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-08-02 09:52:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 09:52:14 -0500 |
| commit | c6974229d018b73f70e38ca8c8862473870d0274 (patch) | |
| tree | 51a95d540eeece7a77c44166caa1ebf120027eba /railties | |
| parent | 4c3c4182a7bde6a736c0b489276da9f77fc430f2 (diff) | |
| parent | 869cb93de12141425b73f43e93f6e3730147b0ed (diff) | |
| download | rails-c6974229d018b73f70e38ca8c8862473870d0274.tar.gz rails-c6974229d018b73f70e38ca8c8862473870d0274.tar.bz2 rails-c6974229d018b73f70e38ca8c8862473870d0274.zip | |
Merge branch 'master' into active-storage-import
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/test_runner_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/application/test_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/plugin_test_runner_test.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb index bcd311c461..be50fdb49b 100644 --- a/railties/test/application/test_runner_test.rb +++ b/railties/test/application/test_runner_test.rb @@ -515,7 +515,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/application/test_test.rb b/railties/test/application/test_test.rb index 32d2a6857c..2a1a6bcbfd 100644 --- a/railties/test/application/test_test.rb +++ b/railties/test/application/test_test.rb @@ -55,7 +55,7 @@ module ApplicationTests end RUBY - assert_unsuccessful_run "unit/foo_test.rb", "Failed assertion" + assert_unsuccessful_run "unit/foo_test.rb", "Failure:\nFooTest#test_truth" end test "integration test" do 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 |