aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorMike Gunderloy <MikeG1@larkfarm.com>2009-01-10 08:43:29 -0600
committerPratik Naik <pratiknaik@gmail.com>2009-01-16 17:25:37 +0000
commit1e02d95d601b4e9f921d9eac34f5f5a44ebd33a2 (patch)
treef813455a1244bc976ee0bdc0fb213595f0f32680 /actionmailer
parent72608521871f73d6b07afa5f6f36e0dedcf1d079 (diff)
downloadrails-1e02d95d601b4e9f921d9eac34f5f5a44ebd33a2.tar.gz
rails-1e02d95d601b4e9f921d9eac34f5f5a44ebd33a2.tar.bz2
rails-1e02d95d601b4e9f921d9eac34f5f5a44ebd33a2.zip
Make ActioMailer quoting test play nice with Ruby 1.9 [#1726 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'actionmailer')
-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")