diff options
| author | Norman Clarke <norman@njclarke.com> | 2012-01-05 15:16:03 -0300 |
|---|---|---|
| committer | Norman Clarke <norman@njclarke.com> | 2012-01-05 15:19:00 -0300 |
| commit | f49febe1db52f8127295c4bb4e742b8ab8324e4e (patch) | |
| tree | a64a3c28287c2c51d4ec435e0e92212e576cfb81 /activesupport/test | |
| parent | c4b522d3c89208b554780e9c49747d07dbe3a4e5 (diff) | |
| parent | 7301aa2e0d3b16b96fcbffcd79ee9bbf6bc65c57 (diff) | |
| download | rails-f49febe1db52f8127295c4bb4e742b8ab8324e4e.tar.gz rails-f49febe1db52f8127295c4bb4e742b8ab8324e4e.tar.bz2 rails-f49febe1db52f8127295c4bb4e742b8ab8324e4e.zip | |
Merge branch 'refactor-multibyte-chars' of https://github.com/lest/rails into multibyte
Conflicts:
activesupport/lib/active_support/multibyte/chars.rb
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/multibyte_chars_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb index 41248cccb6..f25e062873 100644 --- a/activesupport/test/multibyte_chars_test.rb +++ b/activesupport/test/multibyte_chars_test.rb @@ -512,7 +512,7 @@ class MultibyteCharsExtrasTest < Test::Unit::TestCase def test_limit_should_work_on_a_multibyte_string example = chars(UNICODE_STRING) - bytesize = UNICODE_STRING.respond_to?(:bytesize) ? UNICODE_STRING.bytesize : UNICODE_STRING.size + bytesize = UNICODE_STRING.bytesize assert_equal UNICODE_STRING, example.limit(bytesize) assert_equal '', example.limit(0) |