aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/quoting_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer/test/quoting_test.rb')
-rw-r--r--actionmailer/test/quoting_test.rb6
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")