aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/testing.textile
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-07-15 19:36:19 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-07-15 19:36:19 +0530
commita80e1e437e74409d8b47b0c3b0cc0bc9ba78c190 (patch)
treeabcfc7fcc30c7196cb2b71c7217f91d5a344197b /guides/source/testing.textile
parentaa6f5120a71dd04f54f248b6c60890bca6d82adc (diff)
parent92dcdc590ebb8407e7f53c26d501d169799d0eff (diff)
downloadrails-a80e1e437e74409d8b47b0c3b0cc0bc9ba78c190.tar.gz
rails-a80e1e437e74409d8b47b0c3b0cc0bc9ba78c190.tar.bz2
rails-a80e1e437e74409d8b47b0c3b0cc0bc9ba78c190.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/source/testing.textile')
-rw-r--r--guides/source/testing.textile10
1 files changed, 5 insertions, 5 deletions
diff --git a/guides/source/testing.textile b/guides/source/testing.textile
index 26bfc132d8..4faf59fad8 100644
--- a/guides/source/testing.textile
+++ b/guides/source/testing.textile
@@ -357,12 +357,12 @@ There are a bunch of different types of assertions you can use. Here's the compl
|_.Assertion |_.Purpose|
|+assert( boolean, [msg] )+ |Ensures that the object/expression is true.|
-|+assert_equal( obj1, obj2, [msg] )+ |Ensures that +obj1 == obj2+ is true.|
-|+assert_not_equal( obj1, obj2, [msg] )+ |Ensures that +obj1 == obj2+ is false.|
-|+assert_same( obj1, obj2, [msg] )+ |Ensures that +obj1.equal?(obj2)+ is true.|
-|+assert_not_same( obj1, obj2, [msg] )+ |Ensures that +obj1.equal?(obj2)+ is false.|
+|+assert_equal( expected, actual, [msg] )+ |Ensures that +expected == actual+ is true.|
+|+assert_not_equal( expected, actual, [msg] )+ |Ensures that +expected != actual+ is true.|
+|+assert_same( expected, actual, [msg] )+ |Ensures that +expected.equal?(actual)+ is true.|
+|+assert_not_same( expected, actual, [msg] )+ |Ensures that +!expected.equal?(actual)+ is true.|
|+assert_nil( obj, [msg] )+ |Ensures that +obj.nil?+ is true.|
-|+assert_not_nil( obj, [msg] )+ |Ensures that +obj.nil?+ is false.|
+|+assert_not_nil( obj, [msg] )+ |Ensures that +!obj.nil?+ is true.|
|+assert_match( regexp, string, [msg] )+ |Ensures that a string matches the regular expression.|
|+assert_no_match( regexp, string, [msg] )+ |Ensures that a string doesn't match the regular expression.|
|+assert_in_delta( expecting, actual, delta, [msg] )+ |Ensures that the numbers +expecting+ and +actual+ are within +delta+ of each other.|