diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-01-22 15:13:47 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-01-22 15:13:47 -0600 |
| commit | cc0b5fa9930dcc60914e21b518b3c54109243cfa (patch) | |
| tree | 3b5c65d8d0329388730542093314028630b0945a /actionmailer/test/quoting_test.rb | |
| parent | e57cb2629ac4971a5dcb1cf8bb2f6d0509317928 (diff) | |
| parent | ccda96093a3bf3fb360f7c6d61bbbf341b2ae034 (diff) | |
| download | rails-cc0b5fa9930dcc60914e21b518b3c54109243cfa.tar.gz rails-cc0b5fa9930dcc60914e21b518b3c54109243cfa.tar.bz2 rails-cc0b5fa9930dcc60914e21b518b3c54109243cfa.zip | |
Merge branch 'master' into 3-0-unstable
Conflicts:
ci/cruise_config.rb
Diffstat (limited to 'actionmailer/test/quoting_test.rb')
| -rw-r--r-- | actionmailer/test/quoting_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/test/quoting_test.rb b/actionmailer/test/quoting_test.rb index 2650efccdb..2fee1379db 100644 --- a/actionmailer/test/quoting_test.rb +++ b/actionmailer/test/quoting_test.rb @@ -48,8 +48,10 @@ class QuotingTest < Test::Unit::TestCase result = execute_in_sandbox(<<-CODE) $:.unshift(File.dirname(__FILE__) + "/../lib/") - $KCODE = 'u' - require 'jcode' + if RUBY_VERSION < '1.9' + $KCODE = 'u' + require 'jcode' + end require 'action_mailer/quoting' include ActionMailer::Quoting quoted_printable(#{original.inspect}, "UTF-8") |