diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 04:58:55 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 04:58:55 +0000 |
| commit | eede40bcf00d1b6f1bee7f105d18ba3bc17ff306 (patch) | |
| tree | 8bbfabdb1ee33e7c4c11e57e7d691f863b1ae164 | |
| parent | e5cbb849f9eb7a4178bb7925c3dc395adf6b8ac3 (diff) | |
| download | rails-eede40bcf00d1b6f1bee7f105d18ba3bc17ff306.tar.gz rails-eede40bcf00d1b6f1bee7f105d18ba3bc17ff306.tar.bz2 rails-eede40bcf00d1b6f1bee7f105d18ba3bc17ff306.zip | |
Reset @html_document between requests so assert_tag works. Closes #4810.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4591 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 14ccf79009..e9898276b3 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Reset @html_document between requests so assert_tag works. #4810 [jarkko@jlaine.net, easleydp@gmail.com] + * Update render :partial documentation. #5646 [matt@mattmargolis.net] * Integration tests behave well with render_component. #4632 [edward.frederick@revolution.com, dev.rubyonrails@maxdunn.com] diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index f22f7a0250..865a7ae4c0 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -250,6 +250,8 @@ module ActionController # tests. @response.extend(TestResponseBehavior) + @html_document = nil + parse_result return status end |