TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Ruby 1.9 compat: encoding and multibyte test fixes

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2008-04-01 07:39:04 +00:00
parent 300c927b6c
commit 30fa377f33
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actionpack/lib/action_controller/layout.rb
View File

@ -186,9 +186,7 @@ def default_layout(format) #:nodoc:
end
def layout_list #:nodoc:
view_paths.collect do |path|
Dir["#{path}/layouts/**/*"]
end.flatten
Array(view_paths).sum([]) { |path| Dir["#{path}/layouts/**/*"] }
end
private

6
actionpack/test/controller/request_test.rb
View File

@ -835,8 +835,10 @@ def test_mixed_files
assert_equal 'bar', params['foo']
# Ruby CGI doesn't handle multipart/mixed for us.
assert_kind_of String, params['files']
assert_equal 19756, params['files'].size
files = params['files']
assert_kind_of String, files
files.force_encoding('ASCII-8BIT') if files.respond_to?(:force_encoding)
assert_equal 19756, files.size
end
private

8
actionpack/test/template/text_helper_test.rb
View File

@ -136,16 +136,16 @@ def test_excerpt_with_regex
if RUBY_VERSION < '1.9'
def test_excerpt_with_utf8
with_kcode('u') do
assert_equal("...fficiency could not be...", excerpt("That's why efficiency could not be helped", 'could', 8))
assert_equal("...\357\254\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', 8))
end
with_kcode('none') do
assert_equal("...\203ciency could not be...", excerpt("That's why efficiency could not be helped", 'could', 8))
assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', 8))
end
end
else
def test_excerpt_with_utf8
assert_equal("...fficiency could not be...".force_encoding('UTF-8'), excerpt("That's why efficiency could not be helped".force_encoding('UTF-8'), 'could', 8))
assert_equal("...\203ciency could not be...", excerpt("That's why efficiency could not be helped", 'could', 8))
assert_equal("...\357\254\203ciency could not be...".force_encoding('UTF-8'), excerpt("That's why e\357\254\203ciency could not be helped".force_encoding('UTF-8'), 'could', 8))
assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', 8))
end
end