Ticket #9747: send_accept_charset_header_with_basic_auth.2.diff

actionpack/test/controller/http_authentication_test.rb

@@ -2 +2 @@
-
-class HttpBasicAuthenticationTest < Test::Unit::TestCase
-  include ActionController::HttpAuthentication::Basic
+
+  cattr_accessor :default_charset
+  @@default_charset = 'utf-8'
-  
-  class DummyController
-    attr_accessor :headers, :renders, :request
+
+    cattr_accessor :default_charset
+    @@default_charset = 'utf-8'
-    
-    def initialize
-      @headers, @renders = {}, []
@@ -43 +49 @@
-  
-  def test_authentication_request
-    authentication_request(@controller, "Megaglobalapp")
+    assert_equal @controller.class.default_charset, @controller.headers["Accept-Charset"]
-    assert_equal 'Basic realm="Megaglobalapp"', @controller.headers["WWW-Authenticate"]
-    assert_equal :unauthorized, @controller.renders.first[:status]
-  end

actionpack/lib/action_controller/http_authentication.rb

@@ -120 +120 @@
-      end
-
-      def authentication_request(controller, realm)
+        controller.headers["Accept-Charset"] = self.class.default_charset
-        controller.headers["WWW-Authenticate"] = %(Basic realm="#{realm.gsub(/"/, "")}")
-        controller.send! :render, :text => "HTTP Basic: Access denied.\n", :status => :unauthorized
-        return false