diff options
author | Xavier Noria <fxn@hashref.com> | 2010-08-31 00:24:05 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-08-31 00:24:05 +0200 |
commit | 3805d01c9b0ee6681d3e36233a82731200b87d34 (patch) | |
tree | 0c50c954f6561c64438dc14a7771f9ac4c320003 /actionpack/lib/action_dispatch/testing/assertions/selector.rb | |
parent | d37a65307d280e47eb5c15b61c0b20ac6cab6a84 (diff) | |
parent | c30f6c270da5cd2ad7605ee9255f052e93609e30 (diff) | |
download | rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.gz rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.bz2 rails-3805d01c9b0ee6681d3e36233a82731200b87d34.zip |
resolves merge conflict
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions/selector.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/selector.rb | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb index 2fc9e2b7d6..e1015c62cd 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb @@ -24,10 +24,6 @@ module ActionDispatch # # Also see HTML::Selector to learn how to use selectors. module SelectorAssertions - # :call-seq: - # css_select(selector) => array - # css_select(element, selector) => array - # # Select and return all matching elements. # # If called with a single argument, uses that argument as a selector @@ -99,10 +95,6 @@ module ActionDispatch selector.select(root) end - # :call-seq: - # assert_select(selector, equality?, message?) - # assert_select(element, selector, equality?, message?) - # # An assertion that selects elements and makes one or more equality tests. # # If the first argument is an element, selects all matching elements @@ -332,11 +324,6 @@ module ActionDispatch end end - # :call-seq: - # assert_select_rjs(id?) { |elements| ... } - # assert_select_rjs(statement, id?) { |elements| ... } - # assert_select_rjs(:insert, position, id?) { |elements| ... } - # # Selects content from the RJS response. # # === Narrowing down @@ -474,9 +461,6 @@ module ActionDispatch end end - # :call-seq: - # assert_select_encoded(element?) { |elements| ... } - # # Extracts the content of an element, treats it as encoded HTML and runs # nested assertion on it. # @@ -543,9 +527,6 @@ module ActionDispatch end end - # :call-seq: - # assert_select_email { } - # # Extracts the body of an email and runs nested assertions on it. # # You must enable deliveries for this assertion to work, use: |