diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-21 02:35:22 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-21 02:35:22 -0800 |
| commit | 28e869d77ee8515c2fe21c6052d33ab41479a47e (patch) | |
| tree | 11ff189ccf07795efc90d7b3f1a1e2ad1c0c5e87 /actionpack | |
| parent | 559196519a860e49886f586d0169aca23cbcdeb0 (diff) | |
| parent | 7276fc63be79a5769acb28b54d248c87591c1825 (diff) | |
| download | rails-28e869d77ee8515c2fe21c6052d33ab41479a47e.tar.gz rails-28e869d77ee8515c2fe21c6052d33ab41479a47e.tar.bz2 rails-28e869d77ee8515c2fe21c6052d33ab41479a47e.zip | |
Merge pull request #4090 from arunagw/more_more_more_187_removal
Removed test which works only < 1.9
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/lib/testing_sandbox.rb | 15 | ||||
| -rw-r--r-- | actionpack/test/template/output_safety_helper_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/sanitize_helper_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/text_helper_test.rb | 2 |
4 files changed, 0 insertions, 21 deletions
diff --git a/actionpack/test/lib/testing_sandbox.rb b/actionpack/test/lib/testing_sandbox.rb deleted file mode 100644 index c36585104f..0000000000 --- a/actionpack/test/lib/testing_sandbox.rb +++ /dev/null @@ -1,15 +0,0 @@ -module TestingSandbox - # Temporarily replaces KCODE for the block - def with_kcode(kcode) - if RUBY_VERSION < '1.9' - old_kcode, $KCODE = $KCODE, kcode - begin - yield - ensure - $KCODE = old_kcode - end - else - yield - end - end -end diff --git a/actionpack/test/template/output_safety_helper_test.rb b/actionpack/test/template/output_safety_helper_test.rb index fc127c24e9..76c71c9e6d 100644 --- a/actionpack/test/template/output_safety_helper_test.rb +++ b/actionpack/test/template/output_safety_helper_test.rb @@ -1,9 +1,7 @@ require 'abstract_unit' -require 'testing_sandbox' class OutputSafetyHelperTest < ActionView::TestCase tests ActionView::Helpers::OutputSafetyHelper - include TestingSandbox def setup @string = "hello" diff --git a/actionpack/test/template/sanitize_helper_test.rb b/actionpack/test/template/sanitize_helper_test.rb index 222d4dbf4c..4182af590e 100644 --- a/actionpack/test/template/sanitize_helper_test.rb +++ b/actionpack/test/template/sanitize_helper_test.rb @@ -1,11 +1,9 @@ require 'abstract_unit' -require 'testing_sandbox' # The exhaustive tests are in test/controller/html/sanitizer_test.rb. # This tests the that the helpers hook up correctly to the sanitizer classes. class SanitizeHelperTest < ActionView::TestCase tests ActionView::Helpers::SanitizeHelper - include TestingSandbox def test_strip_links assert_equal "Dont touch me", strip_links("Dont touch me") diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb index 96af824b51..839bf900dc 100644 --- a/actionpack/test/template/text_helper_test.rb +++ b/actionpack/test/template/text_helper_test.rb @@ -1,10 +1,8 @@ # encoding: utf-8 require 'abstract_unit' -require 'testing_sandbox' class TextHelperTest < ActionView::TestCase tests ActionView::Helpers::TextHelper - include TestingSandbox def setup super |