diff options
| author | Marcel Molina <marcel@vernix.org> | 2007-11-06 23:33:40 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2007-11-06 23:33:40 +0000 |
| commit | 94502623fb8354ba0c88b9d1bc94bf940e0d5018 (patch) | |
| tree | 3feef6b8342bac8a8f8ef3db5f051e536bce8a4f /actionpack/lib/action_controller/assertions | |
| parent | 19d4c212cd35be37d67eb20bb4152356df96681b (diff) | |
| download | rails-94502623fb8354ba0c88b9d1bc94bf940e0d5018.tar.gz rails-94502623fb8354ba0c88b9d1bc94bf940e0d5018.tar.bz2 rails-94502623fb8354ba0c88b9d1bc94bf940e0d5018.zip | |
Standardize on using hyphens rather than colons to separate option names from their explanation in documentation. Replace + with tt tags. Closes #8732. [ryanb]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8106 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/assertions')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/response_assertions.rb | 8 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/assertions/selector_assertions.rb | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/assertions/response_assertions.rb b/actionpack/lib/action_controller/assertions/response_assertions.rb index 09fb4f9a1b..29eb2b033a 100644 --- a/actionpack/lib/action_controller/assertions/response_assertions.rb +++ b/actionpack/lib/action_controller/assertions/response_assertions.rb @@ -6,10 +6,10 @@ module ActionController module ResponseAssertions # Asserts that the response is one of the following types: # - # * <tt>:success</tt>: Status code was 200 - # * <tt>:redirect</tt>: Status code was in the 300-399 range - # * <tt>:missing</tt>: Status code was 404 - # * <tt>:error</tt>: Status code was in the 500-599 range + # * <tt>:success</tt> - Status code was 200 + # * <tt>:redirect</tt> - Status code was in the 300-399 range + # * <tt>:missing</tt> - Status code was 404 + # * <tt>:error</tt> - Status code was in the 500-599 range # # You can also pass an explicit status number like assert_response(501) # or its symbolic equivalent assert_response(:not_implemented). diff --git a/actionpack/lib/action_controller/assertions/selector_assertions.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb index 9103670742..f70186fe17 100644 --- a/actionpack/lib/action_controller/assertions/selector_assertions.rb +++ b/actionpack/lib/action_controller/assertions/selector_assertions.rb @@ -326,14 +326,16 @@ module ActionController # that update or insert an element with that identifier. # # Use the first argument to narrow down assertions to only statements - # of that type. Possible values are +:replace+, +:replace_html+, +:show+, - # +:hide+, +:toggle+, +:remove+ and +:insert_html+. + # of that type. Possible values are <tt>:replace</tt>, <tt>:replace_html</tt>, + # <tt>:show</tt>, <tt>:hide</tt>, <tt>:toggle</tt>, <tt>:remove</tt> and + # <tt>:insert_html</tt>. # - # Use the argument +:insert+ followed by an insertion position to narrow + # Use the argument <tt>:insert</tt> followed by an insertion position to narrow # down the assertion to only statements that insert elements in that - # position. Possible values are +:top+, +:bottom+, +:before+ and +:after+. + # position. Possible values are <tt>:top</tt>, <tt>:bottom</tt>, <tt>:before</tt> + # and <tt>:after</tt>. # - # Using the +:remove+ statement, you will be able to pass a block, but it will + # Using the <tt>:remove</tt> statement, you will be able to pass a block, but it will # be ignored as there is no HTML passed for this statement. # # === Using blocks |