diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-10 00:33:32 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-10 00:33:32 +0000 |
| commit | 1ab84247ca4b80afbd82afe7539b3449636344c4 (patch) | |
| tree | 9ca5e3bee3a07b68c9d900ff129b69bc740405c2 /railties/guides/source/testing.textile | |
| parent | b6fb79c531a0079274f7b459302e6290c9183f28 (diff) | |
| parent | 4458edc882b229ea44602da20a6440a6f233f1c8 (diff) | |
| download | rails-1ab84247ca4b80afbd82afe7539b3449636344c4.tar.gz rails-1ab84247ca4b80afbd82afe7539b3449636344c4.tar.bz2 rails-1ab84247ca4b80afbd82afe7539b3449636344c4.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/guides/files/stylesheets/main.css
railties/guides/rails_guides/generator.rb
railties/guides/source/index.erb.textile
Diffstat (limited to 'railties/guides/source/testing.textile')
| -rw-r--r-- | railties/guides/source/testing.textile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile index 9b764806a8..9897fbab6f 100644 --- a/railties/guides/source/testing.textile +++ b/railties/guides/source/testing.textile @@ -396,7 +396,7 @@ There are a bunch of different types of assertions you can use. Here's the compl |+assert_no_match( regexp, string, [msg] )+ |Ensures that a string doesn't matches the regular expression.| |+assert_in_delta( expecting, actual, delta, [msg] )+ |Ensures that the numbers +expecting+ and +actual+ are within +delta+ of each other.| |+assert_throws( symbol, [msg] ) { block }+ |Ensures that the given block throws the symbol.| -|+assert_raises( exception1, exception2, ... ) { block }+ |Ensures that the given block raises one of the given exceptions.| +|+assert_raise( exception1, exception2, ... ) { block }+ |Ensures that the given block raises one of the given exceptions.| |+assert_nothing_raised( exception1, exception2, ... ) { block }+ |Ensures that the given block doesn't raise one of the given exceptions.| |+assert_instance_of( class, obj, [msg] )+ |Ensures that +obj+ is of the +class+ type.| |+assert_kind_of( class, obj, [msg] )+ |Ensures that +obj+ is or descends from +class+.| |