diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-05-17 15:23:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 15:23:21 -0400 |
| commit | 0804e58e1e6a52190a950f863622102b6b21ccb8 (patch) | |
| tree | a2d9887906bd2c472edc54907362b93a57f52f0f /activesupport/test/time_travel_test.rb | |
| parent | f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76 (diff) | |
| parent | 385d9af299fbfac7f063de214d371545bafef5df (diff) | |
| download | rails-0804e58e1e6a52190a950f863622102b6b21ccb8.tar.gz rails-0804e58e1e6a52190a950f863622102b6b21ccb8.tar.bz2 rails-0804e58e1e6a52190a950f863622102b6b21ccb8.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'activesupport/test/time_travel_test.rb')
| -rw-r--r-- | activesupport/test/time_travel_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/time_travel_test.rb b/activesupport/test/time_travel_test.rb index e0d3fb0cf5..9d354f14f4 100644 --- a/activesupport/test/time_travel_test.rb +++ b/activesupport/test/time_travel_test.rb @@ -99,7 +99,7 @@ class TimeTravelTest < ActiveSupport::TestCase #noop end end - assert_match(/Calling `travel_to` with a block, when we have previously already made a call to `travel_to`, can lead to confusing time stubbing./, e.message) + assert_match(/Calling `travel_to` with a block, when we have previously already made a call to `travel_to`, can lead to confusing time stubbing\./, e.message) end end end |