diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-15 13:13:55 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-15 13:13:55 +0530 |
commit | 59b03d418ff59fe6bfba6a1b651ef0ac15a2738c (patch) | |
tree | 452b7f200c87ea8a7df1d2b651f1d4f0062e50f6 /actionpack/lib/action_dispatch/testing/assertions/tag.rb | |
parent | 0be7fabd4eb77828e7deff7513faa3834d1a021a (diff) | |
parent | 7cd88840939cac913899fa9a11281d78388672ad (diff) | |
download | rails-59b03d418ff59fe6bfba6a1b651ef0ac15a2738c.tar.gz rails-59b03d418ff59fe6bfba6a1b651ef0ac15a2738c.tar.bz2 rails-59b03d418ff59fe6bfba6a1b651ef0ac15a2738c.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/asset_tag_helper.rb
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions/tag.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/tag.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/tag.rb b/actionpack/lib/action_dispatch/testing/assertions/tag.rb index 5c735e61b2..68f1347e7c 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/tag.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/tag.rb @@ -48,8 +48,6 @@ module ActionDispatch # * if the condition is +true+, the value must not be +nil+. # * if the condition is +false+ or +nil+, the value must be +nil+. # - # === Examples - # # # Assert that there is a "span" tag # assert_tag :tag => "span" # @@ -104,7 +102,6 @@ module ActionDispatch # Identical to +assert_tag+, but asserts that a matching tag does _not_ # exist. (See +assert_tag+ for a full discussion of the syntax.) # - # === Examples # # Assert that there is not a "div" containing a "p" # assert_no_tag :tag => "div", :descendant => { :tag => "p" } # |