mspec 1.3.0 → 1.3.1

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'spec/rake/spectask'
 require 'rake/gempackagetask'
+require 'lib/mspec/version'
 
 Spec::Rake::SpecTask.new
 
@@ -9,7 +10,7 @@ task :default => :spec
 
 spec = Gem::Specification.new do |s|
   s.name                      = %q{mspec}
-  s.version                   = "1.3.0"
+  s.version                   = MSpec::VERSION
 
   s.specification_version     = 2 if s.respond_to? :specification_version=
 

data/lib/mspec/runner/actions/tag.rb

@@ -48,9 +48,9 @@ class TagAction < ActionFilter
   end
 
   # Callback for the MSpec :exception event. Sets the +#exception?+
-  # flag.
+  # flag to true.
   def exception(exception)
-    @exception = exception
+    @exception = true
   end
 
   # Callback for the MSpec :after event. Performs the tag action
@@ -86,7 +86,7 @@ class TagAction < ActionFilter
   # Returns true if an exception was raised while evaluating the
   # current example.
   def exception?
-    !!@exception
+    @exception
   end
 
   def report
@@ -117,6 +117,7 @@ class TagAction < ActionFilter
 
   def register
     super
+    MSpec.register :before,    self
     MSpec.register :exception, self
     MSpec.register :after,     self
     MSpec.register :finish,    self
@@ -124,6 +125,7 @@ class TagAction < ActionFilter
 
   def unregister
     super
+    MSpec.unregister :before,    self
     MSpec.unregister :exception, self
     MSpec.unregister :after,     self
     MSpec.unregister :finish,    self

data/lib/mspec/runner/context.rb

@@ -73,10 +73,10 @@ class ContextState
 
         if protect("before :each", @before)
           MSpec.clear_expectations
-          protect nil, spec
+          passed = protect nil, spec
           if spec
             MSpec.actions :example, state, spec
-            protect nil, @expectation_missing unless MSpec.expectation?
+            protect nil, @expectation_missing unless MSpec.expectation? or not passed
           end
           protect "after :each", @after
           protect "Mock.verify_count", @mock_verify

data/lib/mspec/runner/formatters/specdoc.rb

@@ -16,6 +16,7 @@ class SpecdocFormatter < DottedFormatter
   # Callback for the MSpec :before event. Prints the
   # +it+ block string.
   def before(state)
+    super
     print "- #{state.it}"
   end
 

data/lib/mspec/version.rb

@@ -1,3 +1,3 @@
 module MSpec
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/spec/runner/actions/tag_spec.rb

@@ -266,6 +266,11 @@ describe TagAction, "#register" do
     @action = TagAction.new :add, :all, nil, nil, nil, nil
   end
 
+  it "registers itself with MSpec for the :before event" do
+    MSpec.should_receive(:register).with(:before, @action)
+    @action.register
+  end
+
   it "registers itself with MSpec for the :after event" do
     MSpec.should_receive(:register).with(:after, @action)
     @action.register
@@ -289,8 +294,12 @@ describe TagAction, "#unregister" do
     @action = TagAction.new :add, :all, nil, nil, nil, nil
   end
 
+  it "unregisters itself with MSpec for the :before event" do
+    MSpec.should_receive(:unregister).with(:before, @action)
+    @action.unregister
+  end
+
   it "unregisters itself with MSpec for the :after event" do
-    MSpec.should_receive(:unregister).with(:exception, @action)
     MSpec.should_receive(:unregister).with(:after, @action)
     @action.unregister
   end

data/spec/runner/context_spec.rb

@@ -231,6 +231,12 @@ describe ContextState, "#process" do
     @state.process
     ScratchPad.recorded.should be_nil
   end
+
+  it "does not raise an ExpectationNotFoundError if the #it block causes a failure" do
+    @state.it("it") { raise Exception, "Failed!" }
+    @state.process
+    ScratchPad.recorded.should be_nil
+  end
 end
 
 describe ContextState, "#process" do

data/spec/runner/formatters/specdoc_spec.rb

@@ -45,6 +45,14 @@ describe SpecdocFormatter, "#before" do
     @formatter.before @state
     @out.should == "- it"
   end
+
+  it "resets the #exception? flag" do
+    exc = ExceptionState.new @state, nil, ExpectationNotMetError.new("disappointing")
+    @formatter.exception exc
+    @formatter.exception?.should be_true
+    @formatter.before @state
+    @formatter.exception?.should be_false
+  end
 end
 
 describe SpecdocFormatter, "#exception" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Brian Ford