diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-17 22:12:42 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-17 22:12:42 -0700 |
| commit | 39441f78e3a4bda8774b0a94214ac53dafb6ee8a (patch) | |
| tree | 6d8c11c51ccffd60707fc8f64bcb20f501a12abb /actionpack/CHANGELOG.md | |
| parent | ac5cc6957142f2b22eee0f86710fa18f60313aec (diff) | |
| parent | 0f5ba6e124b583fa0c92fc6e82fff124673d8e0d (diff) | |
| download | rails-39441f78e3a4bda8774b0a94214ac53dafb6ee8a.tar.gz rails-39441f78e3a4bda8774b0a94214ac53dafb6ee8a.tar.bz2 rails-39441f78e3a4bda8774b0a94214ac53dafb6ee8a.zip | |
Merge pull request #10800 from 907th/fix-custom-message-for-assert_redirected_to
Fix #10842. `assert_redirected_to` does not show user-supplied message.
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index ac260a9592..28bacd392b 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,14 @@ ## unreleased ## +* Fix `ActionDispatch::Assertions::ResponseAssertions#assert_redirected_to` + does not show user-supplied message. + + Issue: when `assert_redirected_to` fails due to the response redirect not + matching the expected redirect the user-supplied message (second parameter) + is not shown. This message is only shown if the response is not a redirect. + + *Alexey Chernenkov* + * Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is no `:to` present in the options hash so should only affect routes using the |