Merge commit 'mainstream/master'

Conflicts:

	actionpack/lib/action_controller/cookies.rb
	actionpack/lib/action_controller/streaming.rb
	actionpack/lib/action_controller/test_case.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/helpers/date_helper.rb
	actionpack/lib/action_view/helpers/debug_helper.rb
	actionpack/lib/action_view/helpers/form_options_helper.rb
	actionpack/lib/action_view/helpers/javascript_helper.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/validations.rb
	activeresource/README
	activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
	activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb
	activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb
	railties/doc/guides/actionview/helpers.markdown
	railties/doc/guides/actionview/partials.markdown
	railties/doc/guides/activerecord/basics.markdown

1 files changed, 5 insertions, 12 deletions

diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index b9cf1e2bb0..66675aaa13 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -171,7 +171,7 @@ module ActionController #:nodoc:
 
     # Was the response successful?
     def success?
-      response_code == 200
+      (200..299).include?(response_code)
     end
 
     # Was the URL not found?
@@ -205,17 +205,10 @@ module ActionController #:nodoc:
       p.match(redirect_url) != nil
     end
 
-    # Returns the template path of the file which was used to
-    # render this response (or nil) 
-    def rendered_file(with_controller = false)
-      if template.first_render
-        template.first_render.to_s
-      end
-    end
-
-    # Was this template rendered by a file?
-    def rendered_with_file?
-      !rendered_file.nil?
+    # Returns the template of the file which was used to
+    # render this response (or nil)
+    def rendered_template
+      template._first_render
     end
 
     # A shortcut to the flash. Returns an empty hash if no session flash exists.