Whoops, merge of 13:a9f1ce3766d1.
--- a/specky/snippets/rspec.snippets Sat Feb 20 21:44:40 2010 -0800
+++ b/specky/snippets/rspec.snippets Sat Feb 20 21:46:21 2010 -0800
@@ -135,16 +135,16 @@
snippet shnbp
${1:target}.should_not ${2:be_${3:predicate}} ${4}
snippet exre
- expect { ${1} }.to raise_error( ${2:ErrorClass}, /${3:message match}/i )
+ expect { ${1} }.to raise_exception( ${2:ErrorClass}, /${3:message match}/i )
${4}
snippet exnre
- expect { ${1} }.to_not raise_error( ${2:ErrorClass} )
+ expect { ${1} }.to_not raise_exception( ${2:ErrorClass} )
${3}
snippet shre
- lambda { ${1} }.should raise_error( ${2:ErrorClass}, /${3:message match}/i )
+ lambda { ${1} }.should raise_exception( ${2:ErrorClass}, /${3:message match}/i )
${4}
snippet shnre
- lambda { ${1} }.should_not raise_error( ${2:ErrorClass} )
+ lambda { ${1} }.should_not raise_exception( ${2:ErrorClass} )
${3}
snippet shr
${1:mock}.should_receive( :${2:message} )${3}
--- a/specky/syntax/rspec.vim Sat Feb 20 21:44:40 2010 -0800
+++ b/specky/syntax/rspec.vim Sat Feb 20 21:46:21 2010 -0800
@@ -21,7 +21,7 @@
syntax keyword rspecKeywords should should_not should_not_receive should_receive
highlight link rspecKeywords Constant
-syntax keyword rspecMatchers be_a be_a_kind_of be_an be_an_instance_of be_close be_false be_instance_of be_kind_of be_nil be_true change eql equal exist expect have have_at_least have_at_most have_exactly include match matcher raise_error respond_to satisfy throw_symbol to to_not wrap_expectation
+syntax keyword rspecMatchers be_a be_a_kind_of be_an be_an_instance_of be_close be_false be_instance_of be_kind_of be_nil be_true change eql equal exist expect have have_at_least have_at_most have_exactly include match matcher raise_error raise_exception respond_to satisfy throw_symbol to to_not wrap_expectation
highlight link rspecMatchers Function
syntax keyword rspecMessageExpectation advise any_number_of_times at_least at_most exactly expected_messages_received generate_error ignoring_args matches_at_least_count matches_at_most_count matches_exact_count matches_name_but_not_args negative_expectation_for never once ordered similar_messages times twice verify_messages_received with