aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-02-10 16:50:35 +0100
committerJosé Valim <jose.valim@gmail.com>2011-02-10 16:50:35 +0100
commit89a5f1463d7e9546ed7a0cf482afea99ba2040e7 (patch)
tree2a8ed779ae295c83dcb886839bf47be0bcdbbee0 /actionpack/test/template
parent98c0c5db50a7679b3d58769ac22cb0a27a62c930 (diff)
downloadrails-89a5f1463d7e9546ed7a0cf482afea99ba2040e7.tar.gz
rails-89a5f1463d7e9546ed7a0cf482afea99ba2040e7.tar.bz2
rails-89a5f1463d7e9546ed7a0cf482afea99ba2040e7.zip
Revert "Removed Array#safe_join in AS core_ext and moved it to a view helper with the same same."
Applied the wrong version. This reverts commit 98c0c5db50a7679b3d58769ac22cb0a27a62c930.
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/output_safety_helper_test.rb55
-rw-r--r--actionpack/test/template/raw_output_helper_test.rb21
2 files changed, 21 insertions, 55 deletions
diff --git a/actionpack/test/template/output_safety_helper_test.rb b/actionpack/test/template/output_safety_helper_test.rb
deleted file mode 100644
index 3c52b63d40..0000000000
--- a/actionpack/test/template/output_safety_helper_test.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'abstract_unit'
-require 'testing_sandbox'
-
-class OutputSafetyHelperTest < ActionView::TestCase
- tests ActionView::Helpers::OutputSafetyHelper
- include TestingSandbox
-
- def setup
- @string = "hello"
- end
-
- test "raw returns the safe string" do
- result = raw(@string)
- assert_equal @string, result
- assert result.html_safe?
- end
-
- test "raw handles nil values correctly" do
- assert_equal "", raw(nil)
- end
-
- test "joining safe elements without a separator is safe" do
- array = 5.times.collect { "some string".html_safe }
- assert safe_join(array).html_safe?
- end
-
- test "Joining safe elements with a safe separator is safe" do
- array = 5.times.collect { "some string".html_safe }
- assert safe_join(array, "-".html_safe).html_safe?
- end
-
- test "Joining safe elements with an unsafe separator is unsafe" do
- array = 5.times.collect { "some string".html_safe }
- assert !safe_join(array, "-").html_safe?
- end
-
- test "Joining is unsafe if any element is unsafe even with a safe separator" do
- array = 5.times.collect { "some string".html_safe }
- array << "some string"
- assert !safe_join(array, "-".html_safe).html_safe?
- end
-
- test "Joining is unsafe if any element is unsafe and no separator is given" do
- array = 5.times.collect { "some string".html_safe }
- array << "some string"
- assert !safe_join(array).html_safe?
- end
-
- test "Joining is unsafe if any element is unsafe and the separator is unsafe" do
- array = 5.times.collect { "some string".html_safe }
- array << "some string"
- assert !safe_join(array, "-").html_safe?
- end
-
-end \ No newline at end of file
diff --git a/actionpack/test/template/raw_output_helper_test.rb b/actionpack/test/template/raw_output_helper_test.rb
new file mode 100644
index 0000000000..598aa5b1d8
--- /dev/null
+++ b/actionpack/test/template/raw_output_helper_test.rb
@@ -0,0 +1,21 @@
+require 'abstract_unit'
+require 'testing_sandbox'
+
+class RawOutputHelperTest < ActionView::TestCase
+ tests ActionView::Helpers::RawOutputHelper
+ include TestingSandbox
+
+ def setup
+ @string = "hello"
+ end
+
+ test "raw returns the safe string" do
+ result = raw(@string)
+ assert_equal @string, result
+ assert result.html_safe?
+ end
+
+ test "raw handles nil values correctly" do
+ assert_equal "", raw(nil)
+ end
+end \ No newline at end of file