Fixes to ActionController::TemplateAssertions #16027
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tgxworld
changed the title
| @@ -140,6 +147,8 @@ def assert_template(options = {}, message = nil) | |||
|
|
|||
| if options[:file] | |||
| assert_includes @_files.keys, options[:file] | |||
| else | |||
There was a problem hiding this comment.
shouldn't this only happen if I specified the :file option?
elsif options.key?(:file)There was a problem hiding this comment.
ah yes you're right. I'll make the changes. Thanks 😄
|
@senny updated per your comments. |
|
@tgxworld can you squash your commits? |
|
this changes behavior, let's also add an entry to the CHANGELOG. |
The test was not failing for `assert_template file: nil` when a file has been rendered.
|
@senny Done 😄 |
senny
added a commit
that referenced
this pull request
Aug 14, 2014
Fixes to ActionController::TemplateAssertions
|
@tgxworld thank you 💛 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.