Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

REBASED: fixing assert_template bug when template matches expected, but not ends with #7659

Merged
merged 1 commit into from Sep 30, 2012

Conversation

Projects
None yet
3 participants
Contributor

HugoLnx commented Sep 16, 2012

Pull request #5767 rebased ;)

Owner

rafaelfranca commented Sep 17, 2012

And don't forget to squash your commits.

Member

drogus commented Sep 17, 2012

@rafaelfranca since one of the commits is from the other commiter, I would say that squashing commits is not that necassery, in case of revert or something, we can revert merge commit

Owner

rafaelfranca commented Sep 17, 2012

Fine then

Owner

rafaelfranca commented Sep 28, 2012

@HugoLnx ping

Contributor

HugoLnx commented Sep 29, 2012

...pong!
I will do the changes next sunday. ;)

Owner

rafaelfranca commented Sep 29, 2012

Ok. Thanks. 👍

`assert_template` no more passing with what ever string that matches.
Given Im rendering an template `/layout/hello.html.erb`, assert_template was
passing with any string that matches. This behavior allowed false passing like:

	assert_template "layout"
	assert_template "out/hello"

Now the passing possibilities are:

	assert_template "layout/hello"
	assert_template "hello"

fixing assert_template bug when template matches expected, but not ends with

Cherry Pick Merge: Fixes issue #3849 assert_template false positive

taking redundant test off

prevening incorrect assert_template when rendering with repeated names in path

updating CHANGELOG with bugfix: assert_template false passing
Contributor

HugoLnx commented Sep 30, 2012

Squashed, changeloged and ready! :D

rafaelfranca added a commit that referenced this pull request Sep 30, 2012

Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased
REBASED: fixing assert_template bug when template matches expected, but not ends with

@rafaelfranca rafaelfranca merged commit d0d02bf into rails:master Sep 30, 2012

rafaelfranca added a commit that referenced this pull request Sep 30, 2012

Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased
REBASED: fixing assert_template bug when template matches expected, but not ends with
Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_controller/test_case.rb

rafaelfranca added a commit that referenced this pull request Oct 31, 2012

Revert "Merge pull request #7659 from HugoLnx/template_error_no_match…
…es_rebased"

This reverts commit 7d17cd2.

Conflicts:
	actionpack/CHANGELOG.md

Reason: This added a regression since people were relying on this buggy behavior.
This will introduce back #3849 but we will be backward compatible in
stable release.

Fixes #8068.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment