aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/template_test.rb
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-05-17 19:39:38 +0400
committerwycats <wycats@gmail.com>2010-05-17 19:39:38 +0400
commit02c36cf5cb736a6c7321c8cb9a632a3a74344f25 (patch)
tree09d13f6b9fdee8ea3a796dab22d826d16206388d /actionpack/test/template/template_test.rb
parent821e15e5f2d9ef2aa43918a16cbd00f40c221e95 (diff)
downloadrails-02c36cf5cb736a6c7321c8cb9a632a3a74344f25.tar.gz
rails-02c36cf5cb736a6c7321c8cb9a632a3a74344f25.tar.bz2
rails-02c36cf5cb736a6c7321c8cb9a632a3a74344f25.zip
Make sure encoding changes don't break 1.8
Diffstat (limited to 'actionpack/test/template/template_test.rb')
-rw-r--r--actionpack/test/template/template_test.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index c4a65d84fc..995d728d50 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -1,9 +1,11 @@
require "abstract_unit"
-# These are the normal settings that will be set up by Railties
-# TODO: Have these tests support other combinations of these values
-Encoding.default_internal = "UTF-8"
-Encoding.default_external = "UTF-8"
+if "ruby".encoding_aware?
+ # These are the normal settings that will be set up by Railties
+ # TODO: Have these tests support other combinations of these values
+ Encoding.default_internal = "UTF-8"
+ Encoding.default_external = "UTF-8"
+end
class TestERBTemplate < ActiveSupport::TestCase
ERBHandler = ActionView::Template::Handlers::ERB