aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorTimm <kaspth@gmail.com>2013-08-02 16:05:55 +0200
committerTimm <kaspth@gmail.com>2014-06-16 21:04:00 +0200
commit9f73f9f38cd572cdb7bee42b0ef250c8bbd91cc7 (patch)
treefb7880e5eaeb47133422f26338e1a3714c7bd935 /actionpack/test
parent1bc0bece5b7f51119905e292e6ff9ffb04d15c43 (diff)
downloadrails-9f73f9f38cd572cdb7bee42b0ef250c8bbd91cc7.tar.gz
rails-9f73f9f38cd572cdb7bee42b0ef250c8bbd91cc7.tar.bz2
rails-9f73f9f38cd572cdb7bee42b0ef250c8bbd91cc7.zip
Fixed: assert_select_encoded finds the right content. No longer uses a <encoded> wrapper. Updated tests to reflect this.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/assert_select_test.rb11
1 files changed, 2 insertions, 9 deletions
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index 054cbba40b..42d6bb4432 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -288,18 +288,11 @@ class AssertSelectTest < ActionController::TestCase
</rss>
EOF
assert_select "channel item description" do
- # Test element regardless of wrapper.
+
assert_select_encoded do
assert_select "p", :count=>2, :text=>/Test/
end
- # Test through encoded wrapper.
- assert_select_encoded do
- assert_select "encoded p", :count=>2, :text=>/Test/
- end
- # Use :root instead (recommended)
- assert_select_encoded do
- assert_select ":root p", :count=>2, :text=>/Test/
- end
+
# Test individually.
assert_select "description" do |elements|
assert_select_encoded elements[0] do