From 1e02d95d601b4e9f921d9eac34f5f5a44ebd33a2 Mon Sep 17 00:00:00 2001 From: Mike Gunderloy Date: Sat, 10 Jan 2009 08:43:29 -0600 Subject: [PATCH] Make ActioMailer quoting test play nice with Ruby 1.9 [#1726 state:resolved] Signed-off-by: Pratik Naik --- actionmailer/test/quoting_test.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/actionmailer/test/quoting_test.rb b/actionmailer/test/quoting_test.rb index 2650efccdb814..2fee1379db101 100644 --- a/actionmailer/test/quoting_test.rb +++ b/actionmailer/test/quoting_test.rb @@ -48,8 +48,10 @@ def test_quote_multibyte_chars 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")