lib/spec/matchers/raise_error.rb in rspec-1.1.12 vs lib/spec/matchers/raise_error.rb in rspec-1.2.0

@@ -29,11 +29,11 @@
 
         unless negative_expectation?
           eval_block if @raised_expected_error && @with_expected_message && @block
         end
       ensure
-        return (@raised_expected_error && @with_expected_message) ? (@eval_block ? @eval_block_passed : true) : false
+        return (@raised_expected_error & @with_expected_message) ? (@eval_block ? @eval_block_passed : true) : false
       end
       
       def eval_block
         @eval_block = true
         begin
@@ -53,14 +53,14 @@
         else
           @expected_message == @given_error.message
         end
       end
       
-      def failure_message
+      def failure_message_for_should
         @eval_block ? @given_error.message : "expected #{expected_error}#{given_error}"
       end
 
-      def negative_failure_message
+      def failure_message_for_should_not
         "expected no #{expected_error}#{given_error}"
       end
       
       def description
         "raise #{expected_error}"