From 7776055e2dcd29e0f8f27154663263c0bbd1c188 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Sun, 6 Nov 2011 10:15:04 +0000 Subject: Revert "Skip test_default_external_works on the CI for Ruby 1.9.3." This reverts commit 10773f94eae0dacf10e2ed0c28f6bb73805c2521. --- actionpack/test/template/template_test.rb | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'actionpack/test/template/template_test.rb') diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb index f3328b5dca..70ca876c67 100644 --- a/actionpack/test/template/template_test.rb +++ b/actionpack/test/template/template_test.rb @@ -130,17 +130,6 @@ class TestERBTemplate < ActiveSupport::TestCase # is set to something other than UTF-8, we don't # get any errors and get back a UTF-8 String. def test_default_external_works - if ENV['TRAVIS'] && RUBY_VERSION >= '1.9.3' - skip( - "There is currently a bug in Ruby trunk and in 1.9.3 which makes this test fail. " \ - "Please see http://redmine.ruby-lang.org/issues/5564. " \ - "Given there is no known generic workaround that this requires a fix in Ruby itself, " \ - "this test is skipped on the CI for now so that we don't pollute the CI with failures. " \ - "Jon Leighton is monitoring the bug report and will renable this test when a solution " \ - "becomes available." - ) - end - with_external_encoding "ISO-8859-1" do @template = new_template("hello \xFCmlat") assert_equal Encoding::UTF_8, render.encoding -- cgit v1.2.3