kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Action Pack: fix tests with -K*, work around Ruby 1.9.1 constant lookup.

Browse source 
[#4473 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
Cezary Baginski 2010-04-25 19:48:40 +02:00 committed by Jeremy Kemper
parent 8ec085bf18
commit 490a3335d5
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actionpack/test/controller/send_file_test.rb
View file

@ -25,7 +25,7 @@ class SendFileController < ActionController::Base
end end
def multibyte_text_data def multibyte_text_data
send_data("Кирилица\n祝您好運", options) send_data("Кирилица\n祝您好運.", options)
end end
end end
@ -128,7 +128,7 @@ class SendFileTest < ActionController::TestCase
assert_equal 'image/png', @controller.content_type assert_equal 'image/png', @controller.content_type
end end
def test_send_file_headers_with_bad_symbol def test_send_file_headers_with_bad_symbol
options = { options = {

4
actionpack/test/dispatch/routing_test.rb
View file

@ -237,8 +237,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
AltRoutes = ActionDispatch::Routing::RouteSet.new(AltRequest) AltRoutes = ActionDispatch::Routing::RouteSet.new(AltRequest)
AltRoutes.draw do AltRoutes.draw do
get "/" => XHeader.new, :constraints => {:x_header => /HEADER/} get "/" => TestRoutingMapper::TestAltApp::XHeader.new, :constraints => {:x_header => /HEADER/}
get "/" => AltApp.new get "/" => TestRoutingMapper::TestAltApp::AltApp.new
end end
def app def app

4
activesupport/lib/active_support/multibyte/chars.rb
View file

@ -72,8 +72,8 @@ module ActiveSupport #:nodoc:
def self.codepoints_to_pattern(array_of_codepoints) #:nodoc: def self.codepoints_to_pattern(array_of_codepoints) #:nodoc:
array_of_codepoints.collect{ |e| [e].pack 'U*' }.join('|') array_of_codepoints.collect{ |e| [e].pack 'U*' }.join('|')
end end
UNICODE_TRAILERS_PAT = /(#{codepoints_to_pattern(UNICODE_LEADERS_AND_TRAILERS)})+\Z/ UNICODE_TRAILERS_PAT = /(#{codepoints_to_pattern(UNICODE_LEADERS_AND_TRAILERS)})+\Z/u
UNICODE_LEADERS_PAT = /\A(#{codepoints_to_pattern(UNICODE_LEADERS_AND_TRAILERS)})+/ UNICODE_LEADERS_PAT = /\A(#{codepoints_to_pattern(UNICODE_LEADERS_AND_TRAILERS)})+/u
UTF8_PAT = ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8'] UTF8_PAT = ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8']