Merge remote-tracking branch 'upstream/pull/2709'

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 04837f3903755f1d9ac015b4861bfe4a094a8d9a..9354e664600cd87eccfe4d3107b125bb4b692005 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -115,12 +115,6 @@ module ActiveSupport
       assert_equal a.tags, b.tags, "tags on node #{a.id}"
     end
 
-    ##
-    # set request headers for HTTP basic authentication
-    def basic_authorization(user, pass)
-      @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}"))
-    end
-
     ##
     # return request header for HTTP Basic Authorization
     def basic_authorization_header(user, pass)
@@ -165,17 +159,13 @@ module ActiveSupport
     end
 
     ##
-    # set request header for HTTP Accept
-    def http_accept_format(format)
-      @request.env["HTTP_ACCEPT"] = format
+    # return request header for HTTP Accept
+    def accept_format_header(format)
+      { "Accept" => format }
     end
 
     ##
-    # set request readers to ask for a particular error format
-    def error_format(format)
-      @request.env["HTTP_X_ERROR_FORMAT"] = format
-    end
-
+    # return request header to ask for a particular error format
     def error_format_header(f)
       { "X-Error-Format" => f }
     end