diff options
Diffstat (limited to 'railties/guides/source')
| -rw-r--r-- | railties/guides/source/action_mailer_basics.textile | 3 | ||||
| -rw-r--r-- | railties/guides/source/testing.textile | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile index 6fbc21f7e1..71398382be 100644 --- a/railties/guides/source/action_mailer_basics.textile +++ b/railties/guides/source/action_mailer_basics.textile @@ -6,8 +6,7 @@ endprologue. h3. Introduction -Action Mailer allows you to send emails from your application using a mailer model and views. -So, in Rails, emails are used by creating models that inherit from ActionMailer::Base that live alongside other models in `app/models`. Those models have associated views that appear alongside controller views in `app/views`. +Action Mailer allows you to send emails from your application using a mailer model and views. So, in Rails, emails are used by creating models that inherit from +ActionMailer::Base+ that live alongside other models in +app/models+. Those models have associated views that appear alongside controller views in +app/views+. h3. Sending Emails diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile index 1f6dd36e9d..9b764806a8 100644 --- a/railties/guides/source/testing.textile +++ b/railties/guides/source/testing.textile @@ -550,7 +550,7 @@ NOTE: You may find references to +assert_tag+ in other documentation, but this i There are two forms of +assert_select+: -+assert_select(selector, [equality], [message])`+ ensures that the equality condition is met on the selected elements through the selector. The selector may be a CSS selector expression (String), an expression with substitution values, or an +HTML::Selector+ object. ++assert_select(selector, [equality], [message])+ ensures that the equality condition is met on the selected elements through the selector. The selector may be a CSS selector expression (String), an expression with substitution values, or an +HTML::Selector+ object. +assert_select(element, selector, [equality], [message])+ ensures that the equality condition is met on all the selected elements through the selector starting from the _element_ (instance of +HTML::Node+) and its descendants. |