diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2008-07-16 13:00:36 +0100 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2008-07-16 13:01:23 +0100 |
commit | 0432d151647f2178ddee79979827d552447c251f (patch) | |
tree | 7c772cd260eb051cd7b80cf91468555f03db9e11 /actionpack/lib/action_controller/assertions | |
parent | f7d08acd5e0650658383e3d3f86d6ff5b49e9030 (diff) | |
download | rails-0432d151647f2178ddee79979827d552447c251f.tar.gz rails-0432d151647f2178ddee79979827d552447c251f.tar.bz2 rails-0432d151647f2178ddee79979827d552447c251f.zip |
Merge with docrails.
Diffstat (limited to 'actionpack/lib/action_controller/assertions')
-rw-r--r-- | actionpack/lib/action_controller/assertions/selector_assertions.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/assertions/selector_assertions.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb index d3594e711c..70b0ed53e7 100644 --- a/actionpack/lib/action_controller/assertions/selector_assertions.rb +++ b/actionpack/lib/action_controller/assertions/selector_assertions.rb @@ -21,10 +21,8 @@ module ActionController # from the response HTML or elements selected by the enclosing assertion. # # In addition to HTML responses, you can make the following assertions: - # * +assert_select_rjs+ - Assertions on HTML content of RJS update and - # insertion operations. - # * +assert_select_encoded+ - Assertions on HTML encoded inside XML, - # for example for dealing with feed item descriptions. + # * +assert_select_rjs+ - Assertions on HTML content of RJS update and insertion operations. + # * +assert_select_encoded+ - Assertions on HTML encoded inside XML, for example for dealing with feed item descriptions. # * +assert_select_email+ - Assertions on the HTML body of an e-mail. # # Also see HTML::Selector to learn how to use selectors. |