aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/multibyte_conformance.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/test/multibyte_conformance.rb')
-rw-r--r--activesupport/test/multibyte_conformance.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/activesupport/test/multibyte_conformance.rb b/activesupport/test/multibyte_conformance.rb
index dede3e561d..fdcfda383f 100644
--- a/activesupport/test/multibyte_conformance.rb
+++ b/activesupport/test/multibyte_conformance.rb
@@ -1,7 +1,8 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
require 'open-uri'
-$KCODE = 'UTF8'
+$KCODE = 'UTF8' if RUBY_VERSION < '1.9'
+
UNIDATA_URL = "http://www.unicode.org/Public/#{ActiveSupport::Multibyte::UNICODE_VERSION}/ucd"
UNIDATA_FILE = '/NormalizationTest.txt'
CACHE_DIR = File.dirname(__FILE__) + '/cache'
@@ -138,4 +139,4 @@ class ConformanceTestPure < Test::Unit::TestCase
def setup
@handler = ::ActiveSupport::Multibyte::Handlers::UTF8Handler
end
-end \ No newline at end of file
+end