diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-11-06 10:15:04 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-11-06 10:39:59 +0000 |
| commit | 7776055e2dcd29e0f8f27154663263c0bbd1c188 (patch) | |
| tree | 8cdff7d2b3f11d3e473c41a905f72f408d76986a /actionpack | |
| parent | a02bb72cf73a3d6852cade9ecb7c7c1743d0ad10 (diff) | |
| download | rails-7776055e2dcd29e0f8f27154663263c0bbd1c188.tar.gz rails-7776055e2dcd29e0f8f27154663263c0bbd1c188.tar.bz2 rails-7776055e2dcd29e0f8f27154663263c0bbd1c188.zip | |
Revert "Skip test_default_external_works on the CI for Ruby 1.9.3."
This reverts commit 10773f94eae0dacf10e2ed0c28f6bb73805c2521.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/template/template_test.rb | 11 |
1 files changed, 0 insertions, 11 deletions
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 |