aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-03 20:17:07 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-03 20:17:07 -0700
commit60b8bfa653713bae8bdca266d52f9d00d4acf189 (patch)
treefd7474d989ca79c655766109002e66b209529717 /railties/guides
parent0a38e2a5ce2eaf7393958721edbfcf2a7fe87334 (diff)
parenta6c60222c580e4002152b1ac1857673038b1fd42 (diff)
downloadrails-60b8bfa653713bae8bdca266d52f9d00d4acf189.tar.gz
rails-60b8bfa653713bae8bdca266d52f9d00d4acf189.tar.bz2
rails-60b8bfa653713bae8bdca266d52f9d00d4acf189.zip
Merge pull request #2844 from arunagw/warnings_removed_master
Warnings removed from master
Diffstat (limited to 'railties/guides')
-rw-r--r--railties/guides/source/action_mailer_basics.textile4
-rw-r--r--railties/guides/source/testing.textile2
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 351a4498b1..67761645fa 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -514,8 +514,8 @@ class UserMailerTest < ActionMailer::TestCase
# Test the body of the sent email contains what we expect it to
assert_equal [user.email], email.to
assert_equal "Welcome to My Awesome Site", email.subject
- assert_match /<h1>Welcome to example.com, #{user.name}<\/h1>/, email.encoded
- assert_match /Welcome to example.com, #{user.name}/, email.encoded
+ assert_match(/<h1>Welcome to example.com, #{user.name}<\/h1>/, email.encoded)
+ assert_match(/Welcome to example.com, #{user.name}/, email.encoded)
end
end
</ruby>
diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile
index cc55d1f756..caa0d91a83 100644
--- a/railties/guides/source/testing.textile
+++ b/railties/guides/source/testing.textile
@@ -931,7 +931,7 @@ class UserControllerTest < ActionController::TestCase
assert_equal "You have been invited by me@example.com", invite_email.subject
assert_equal 'friend@example.com', invite_email.to[0]
- assert_match /Hi friend@example.com/, invite_email.body
+ assert_match(/Hi friend@example.com/, invite_email.body)
end
end
</ruby>