mspec 1.2.0 → 1.3.0

data/Rakefile

@@ -9,7 +9,7 @@ task :default => :spec
 
 spec = Gem::Specification.new do |s|
   s.name                      = %q{mspec}
-  s.version                   = "1.2.0"
+  s.version                   = "1.3.0"
 
   s.specification_version     = 2 if s.respond_to? :specification_version=
 

data/lib/mspec/commands/mkspec.rb

@@ -94,8 +94,7 @@ class MkSpec
       f.puts <<-EOS
 
 describe "#{meth}" do
-  it "needs to be reviewed for spec completeness" do
-  end
+  it "needs to be reviewed for spec completeness"
 end
 EOS
     end

data/lib/mspec/commands/mspec.rb

@@ -127,7 +127,8 @@ class MSpecMain < MSpecScript
   def run
     ENV['MSPEC_RUNNER'] = '1'
 
-    argv = config[:flags]
+    argv = ["-v"]
+    argv.concat config[:flags]
     argv.concat config[:includes]
     argv.concat config[:requires]
     argv << "#{MSPEC_HOME}/bin/mspec-#{ config[:command] || "run" }"

data/lib/mspec/expectations/expectations.rb

@@ -1,4 +1,9 @@
 class ExpectationNotMetError < StandardError; end
+class ExpectationNotFoundError < StandardError
+  def message
+    "No behavior expectation was found in the example"
+  end
+end
 
 class Expectation
   def self.fail_with(expected, actual)

data/lib/mspec/expectations/should.rb

@@ -1,5 +1,6 @@
 class Object
   def should(matcher=nil)
+    MSpec.expectation
     MSpec.actions :expectation, MSpec.current.state
     if matcher
       unless matcher.matches?(self)
@@ -11,6 +12,7 @@ class Object
   end
 
   def should_not(matcher=nil)
+    MSpec.expectation
     MSpec.actions :expectation, MSpec.current.state
     if matcher
       if matcher.matches?(self)

data/lib/mspec/helpers/io.rb

@@ -10,4 +10,8 @@ class IOStub < String
   def puts(*str)
     write(str.collect { |s| s.to_s.chomp }.concat([nil]).join("\n"))
   end
+
+  def flush
+    self
+  end
 end

data/lib/mspec/mocks/mock.rb

@@ -41,7 +41,10 @@ module Mock
 
     proxy = MockProxy.new type
 
-    MSpec.actions :expectation, MSpec.current.state if proxy.mock?
+    if proxy.mock?
+      MSpec.expectation
+      MSpec.actions :expectation, MSpec.current.state
+    end
 
     if proxy.stub?
       stubs[key].unshift proxy

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

@@ -50,14 +50,14 @@ class TallyAction
   def register
     MSpec.register :load,        self
     MSpec.register :exception,   self
-    MSpec.register :after,       self
+    MSpec.register :example,     self
     MSpec.register :expectation, self
   end
 
   def unregister
     MSpec.unregister :load,        self
     MSpec.unregister :exception,   self
-    MSpec.unregister :after,       self
+    MSpec.unregister :example,     self
     MSpec.unregister :expectation, self
   end
 
@@ -77,9 +77,9 @@ class TallyAction
     exception.failure? ? @counter.failures! : @counter.errors!
   end
 
-  # Callback for the MSpec :after event. Increments the tally
+  # Callback for the MSpec :example event. Increments the tally
   # of examples.
-  def after(state)
+  def example(state, block)
     @counter.examples!
   end
 

data/lib/mspec/runner/context.rb

@@ -13,16 +13,17 @@ require 'mspec/runner/example'
 # is evaluated, just as +it+ refers to the example itself.
 #++
 class ContextState
+  attr_reader :state
+
   def initialize
-    @start = []
+    @start  = []
     @before = []
-    @after = []
+    @after  = []
     @finish = []
-    @spec = []
-  end
-
-  def state
-    @state
+    @spec   = []
+    @mock_verify         = lambda { Mock.verify_count }
+    @mock_cleanup        = lambda { Mock.cleanup }
+    @expectation_missing = lambda { raise ExpectationNotFoundError }
   end
 
   def before(at=:each, &block)
@@ -54,7 +55,7 @@ class ContextState
   end
 
   def protect(what, blocks, check=true)
-    return false if check and MSpec.pretend_mode?
+    return true if check and MSpec.pretend_mode?
     Array(blocks).all? { |block| MSpec.protect what, &block }
   end
 
@@ -64,21 +65,32 @@ class ContextState
 
     MSpec.shuffle @spec if MSpec.randomize?
     MSpec.actions :enter, @describe
-    protect "before :all", @start
-    @spec.each do |desc, spec, state|
-      @state = state
-      MSpec.actions :before, state
-      if protect("before :each", @before)
-        protect nil, spec
-        protect "after :each", @after
-        protect "Mock.verify_count", lambda { Mock.verify_count }
+
+    if protect "before :all", @start
+      @spec.each do |desc, spec, state|
+        @state = state
+        MSpec.actions :before, state
+
+        if protect("before :each", @before)
+          MSpec.clear_expectations
+          protect nil, spec
+          if spec
+            MSpec.actions :example, state, spec
+            protect nil, @expectation_missing unless MSpec.expectation?
+          end
+          protect "after :each", @after
+          protect "Mock.verify_count", @mock_verify
+        end
+
+        protect "Mock.cleanup", @mock_cleanup
+        MSpec.actions :after, state
+        @state = nil
       end
-      protect "Mock.cleanup", lambda { Mock.cleanup }
-      MSpec.actions :after, state
-      @state = nil
+      protect "after :all", @finish
+    else
+      protect "Mock.cleanup", @mock_cleanup
     end
-    protect "after :all", @finish
+
     MSpec.actions :leave
   end
 end
-

data/lib/mspec/runner/exception.rb

@@ -1,6 +1,8 @@
 class ExceptionState
   attr_reader :description, :describe, :it, :exception
 
+  PATH = /#{File.expand_path(File.dirname(__FILE__) + '/../../..')}/
+
   def initialize(state, location, exception)
     @exception = exception
 
@@ -16,13 +18,14 @@ class ExceptionState
   end
 
   def failure?
-    @exception.is_a? ExpectationNotMetError
+    [ExpectationNotMetError, ExpectationNotFoundError].any? { |e| @exception.is_a? e }
   end
 
   def message
     if @exception.message.empty?
       "<No message>"
-    elsif @exception.class == ExpectationNotMetError
+    elsif @exception.class == ExpectationNotMetError ||
+          @exception.class == ExpectationNotFoundError
       @exception.message
     else
       "#{@exception.class}: #{@exception.message}"
@@ -31,9 +34,10 @@ class ExceptionState
 
   def backtrace
     begin
-      return @exception.awesome_backtrace.show
+      bt = @exception.awesome_backtrace.show.split "\n"
     rescue Exception
-      return @exception.backtrace && @exception.backtrace.join("\n")
+      bt = @exception.backtrace || []
     end
+    bt.reject { |line| PATH =~ line }.join("\n")
   end
 end

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

@@ -93,5 +93,6 @@ class DottedFormatter
   # A convenience method to allow printing to different outputs.
   def print(*args)
     @out.print(*args)
+    @out.flush
   end
 end

data/lib/mspec/runner/mspec.rb

@@ -18,8 +18,10 @@ module MSpec
   @mode    = nil
   @load    = nil
   @unload  = nil
-  @randomize   = nil
-  @expectation = nil
+  @exception    = nil
+  @randomize    = nil
+  @expectation  = nil
+  @expectations = false
 
   def self.describe(mod, msg=nil, &block)
     stack.push ContextState.new
@@ -109,6 +111,7 @@ module MSpec
   #   :enter        before a describe block is run
   #   :before       before a single spec is run
   #   :expectation  before a 'should', 'should_receive', etc.
+  #   :example      after an example block is run, passed the block
   #   :exception    after an exception is rescued
   #   :after        after a single spec is run
   #   :leave        after a describe block is run
@@ -176,6 +179,21 @@ module MSpec
     end
   end
 
+  # Records that an expectation has been encountered in an example.
+  def self.expectation
+    store :expectations, true
+  end
+
+  # Returns true if an expectation has been encountered
+  def self.expectation?
+    retrieve :expectations
+  end
+
+  # Resets the flag that an expectation has been encountered in an example.
+  def self.clear_expectations
+    store :expectations, false
+  end
+
   # Transforms a spec filename into a tags filename by applying each
   # substitution pattern in :tags_pattern. The default patterns are:
   #

data/lib/mspec/utils/name_map.rb

@@ -100,7 +100,6 @@ class NameMap
       hash["#{name}."] = ms.sort unless ms.empty?
 
       ms = m.public_instance_methods(false) +
-           m.private_instance_methods(false) +
            m.protected_instance_methods(false)
       hash["#{name}#"] = ms.sort unless ms.empty?
 

data/lib/mspec/utils/script.rb

@@ -76,6 +76,7 @@ class MSpecScript
   end
 
   def self.main
+    $VERBOSE = nil unless ENV['OUTPUT_WARNINGS']
     script = new
     script.load 'default.mspec'
     script.load '~/.mspecrc'

data/lib/mspec/version.rb

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

data/spec/commands/mkspec_spec.rb

@@ -208,6 +208,16 @@ describe MkSpec, "#write_spec" do
     @script.should_receive(:puts).with("spec/core/tcejbo/inspect_spec.rb")
     @script.write_spec("spec/core/tcejbo/inspect_spec.rb", "Object#inspect", true)
   end
+
+  it "writes a template spec" do
+    @file.should_receive(:puts).with(<<EOS)
+
+describe "Object#inspect" do
+  it "needs to be reviewed for spec completeness"
+end
+EOS
+    @script.write_spec("spec/core/tcejbo/inspect_spec.rb", "Object#inspect", true)
+  end
 end
 
 describe MkSpec, "#create_file" do

data/spec/commands/mspec_spec.rb

@@ -215,16 +215,17 @@ describe MSpecMain, "#run" do
   end
 
   it "uses exec to invoke the runner script" do
-    @script.should_receive(:exec).with("ruby", %r"mspec/bin/mspec-run$")
+    @script.should_receive(:exec).with("ruby", "-v", %r"mspec/bin/mspec-run$")
     @script.options
     @script.run
   end
 
   it "calls #multi_exec if the command is 'ci' and the multi option is passed" do
     @script.should_receive(:multi_exec).and_return do |arg|
-      arg.length.should == 2
-      arg.first.should =~ %r"mspec/bin/mspec-ci$"
-      arg.last.should == "-fy"
+      arg.length.should == 3
+      arg[0].should == "-v"
+      arg[1].should =~ %r"mspec/bin/mspec-ci$"
+      arg[2].should == "-fy"
     end
     @script.options ["ci", "-j"]
     @script.run

data/spec/expectations/expectations_spec.rb

@@ -7,6 +7,19 @@ describe ExpectationNotMetError do
   end
 end
 
+describe ExpectationNotFoundError do
+  it "is a subclass of StandardError" do
+    ExpectationNotFoundError.ancestors.should include(StandardError)
+  end
+end
+
+describe ExpectationNotFoundError, "#message" do
+  it "returns 'No behavior expectation was found in the example'" do
+    m = ExpectationNotFoundError.new.message
+    m.should == "No behavior expectation was found in the example"
+  end
+end
+
 describe Expectation, "#fail_with" do
   it "raises an ExpectationNotMetError" do
     lambda {

data/spec/expectations/should_spec.rb

@@ -19,11 +19,15 @@ end
 describe Object, "#should" do
   before :each do
     class Object; alias_method :should, :mspec_should; end
+
+    @state = mock("example state", :null_object => true)
+    context = mock("context state", :null_object => true)
+    context.stub!(:state).and_return(@state)
+    MSpec.stub!(:current).and_return(context)
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
 
     @target = "target"
-    @matcher = mock("matcher")
+    @matcher = mock("matcher", :null_object => true)
   end
 
   after :each do
@@ -54,17 +58,31 @@ describe Object, "#should" do
     class Object; alias_method :should, :rspec_should; end
     matcher.should be_instance_of(PositiveOperatorMatcher)
   end
+
+  it "invokes the MSpec :expectation actions" do
+    MSpec.should_receive(:actions).with(:expectation, @state)
+    @target.should @matcher
+  end
+
+  it "registers that an expectation has been encountered" do
+    MSpec.should_receive(:expectation)
+    @target.should @matcher
+  end
 end
 
 describe Object, "#should_not" do
   before :each do
     class Object; alias_method :should,     :mspec_should; end
     class Object; alias_method :should_not, :mspec_should_not; end
+
+    @state = mock("example state", :null_object => true)
+    context = mock("context state", :null_object => true)
+    context.stub!(:state).and_return(@state)
+    MSpec.stub!(:current).and_return(context)
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
 
     @target = "target"
-    @matcher = mock("matcher")
+    @matcher = mock("matcher", :null_object => true)
   end
 
   after :each do
@@ -96,4 +114,16 @@ describe Object, "#should_not" do
     class Object; alias_method :should, :rspec_should; end
     matcher.should be_instance_of(NegativeOperatorMatcher)
   end
+
+  it "invokes the MSpec :expectation actions" do
+    MSpec.should_receive(:actions).with(:expectation, @state)
+    @matcher.should_receive(:negative_failure_message).and_return(["expected", "actual"])
+    @target.should_not @matcher rescue nil
+  end
+
+  it "registers that an expectation has been encountered" do
+    MSpec.should_receive(:expectation)
+    @matcher.should_receive(:negative_failure_message).and_return(["expected", "actual"])
+    @target.should_not @matcher rescue nil
+  end
 end

data/spec/helpers/io_spec.rb

@@ -31,4 +31,8 @@ describe IOStub do
     @out.puts "hello", 1, 2, 3
     @out.should == "hello\n1\n2\n3\n"
   end
+
+  it "provides a flush method that does nothing and returns self" do
+    @out.flush.should == @out
+  end
 end

data/spec/mocks/mock_spec.rb

@@ -130,6 +130,14 @@ describe Mock, ".install_method for mocks" do
     Mock.install_method(@mock, :method_call).and_return(1)
     @mock.method_call.should == 1
   end
+
+  it "registers that an expectation has been encountered" do
+    state = mock("run state", :null_object => true)
+    state.stub!(:state).and_return(mock("spec state"))
+    MSpec.should_receive(:expectation)
+    Mock.install_method(@mock, :method_call).and_return(1)
+    @mock.method_call.should == 1
+  end
 end
 
 describe Mock, ".install_method for stubs" do

data/spec/runner/actions/tally_spec.rb

@@ -73,8 +73,8 @@ describe TallyAction do
     @tally.counter.expectations.should == 1
   end
 
-  it "responds to #after by incrementing counts returned by Tally#examples" do
-    @tally.after @state
+  it "responds to #example by incrementing counts returned by Tally#examples" do
+    @tally.example @state, nil
     @tally.counter.examples.should == 1
     @tally.counter.expectations.should == 0
     @tally.counter.failures.should == 0
@@ -101,7 +101,7 @@ describe TallyAction do
 
   it "responds to #format by returning a readable string of counts" do
     @tally.load
-    @tally.after @state
+    @tally.example @state, nil
     @tally.expectation @state
     @tally.expectation @state
     exc = ExceptionState.new nil, nil, ExpectationNotMetError.new("Failed!")
@@ -111,7 +111,7 @@ describe TallyAction do
 
   it "responds to #register by registering itself with MSpec for appropriate actions" do
     MSpec.should_receive(:register).with(:load, @tally)
-    MSpec.should_receive(:register).with(:after, @tally)
+    MSpec.should_receive(:register).with(:example, @tally)
     MSpec.should_receive(:register).with(:exception, @tally)
     MSpec.should_receive(:register).with(:expectation, @tally)
     @tally.register
@@ -120,7 +120,7 @@ describe TallyAction do
   it "responds to #unregister by unregistering itself with MSpec for appropriate actions" do
     MSpec.should_receive(:unregister).with(:load, @tally)
     MSpec.should_receive(:unregister).with(:exception, @tally)
-    MSpec.should_receive(:unregister).with(:after, @tally)
+    MSpec.should_receive(:unregister).with(:example, @tally)
     MSpec.should_receive(:unregister).with(:expectation, @tally)
     @tally.unregister
   end

data/spec/runner/context_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
 require 'mspec/matchers/base'
 require 'mspec/runner/mspec'
 require 'mspec/mocks/mock'
@@ -52,9 +53,9 @@ describe ContextState, "#protect" do
     @c = lambda { raise Exception, "Fail!" }
   end
 
-  it "returns false and does execute any blocks if check is true and MSpec.pretend_mode? is true" do
+  it "returns true and does execute any blocks if check is true and MSpec.pretend_mode? is true" do
     MSpec.stub!(:pretend_mode?).and_return(true)
-    ContextState.new.protect("message", [@a, @b]).should be_false
+    ContextState.new.protect("message", [@a, @b]).should be_true
     ScratchPad.recorded.should == []
   end
 
@@ -136,13 +137,6 @@ describe ContextState, "#process" do
     ScratchPad.recorded.should == [:a, :b]
   end
 
-  it "does not call the it block if an exception is raised in before(:each)" do
-    @state.before(:each) { raise Exception, "Fail!" }
-    @state.it("one", &@a)
-    @state.process
-    ScratchPad.recorded.should == []
-  end
-
   it "calls each before(:each) block" do
     @state.before(:each, &@a)
     @state.before(:each, &@b)
@@ -159,14 +153,6 @@ describe ContextState, "#process" do
     ScratchPad.recorded.should == [:a, :b]
   end
 
-  it "does not call after(:each) if an exception is raised in before(:each)" do
-    @state.before(:each) { raise Exception, "Fail!" }
-    @state.after(:each, &@a)
-    @state.it("") { }
-    @state.process
-    ScratchPad.recorded.should == []
-  end
-
   it "calls Mock.cleanup for each it block" do
     @state.it("") { }
     @state.it("") { }
@@ -181,13 +167,6 @@ describe ContextState, "#process" do
     @state.process
   end
 
-  it "does not call Mock.verify_count if an exception is raised in before(:each)" do
-    @state.before(:each) { raise Exception, "Fail!" }
-    @state.it("") { }
-    Mock.should_not_receive(:verify_count)
-    @state.process
-  end
-
   it "calls the describe block" do
     ScratchPad.record []
     @state.describe(Object, "msg") { ScratchPad << :a }
@@ -203,6 +182,14 @@ describe ContextState, "#process" do
     ScratchPad.recorded.should be_kind_of(ExampleState)
   end
 
+  it "clears the expectations flag before evaluating the #it block" do
+    MSpec.clear_expectations
+    MSpec.should_receive(:clear_expectations)
+    @state.it("it") { ScratchPad.record MSpec.expectation? }
+    @state.process
+    ScratchPad.recorded.should be_false
+  end
+
   it "shuffles the spec list if MSpec.randomize? is true" do
     MSpec.randomize
     MSpec.should_receive(:shuffle)
@@ -212,15 +199,151 @@ describe ContextState, "#process" do
   end
 end
 
-describe ContextState, "#process in pretend mode" do
-  before :all do
-    MSpec.register_mode :pretend
+describe ContextState, "#process" do
+  before :each do
+    MSpec.store :exception, []
+
+    @state = ContextState.new
+    @state.describe("") { }
+
+    action = mock("action")
+    def action.exception(exc)
+      ScratchPad.record :exception if exc.exception.is_a? ExpectationNotFoundError
+    end
+    MSpec.register :exception, action
+
+    MSpec.clear_expectations
+    ScratchPad.clear
   end
 
-  after :all do
-    MSpec.register_mode nil
+  after :each do
+    MSpec.store :exception, nil
   end
 
+  it "raises an ExpectationNotFoundError if an #it block does not contain an expectation" do
+    @state.it("it") { }
+    @state.process
+    ScratchPad.recorded.should == :exception
+  end
+
+  it "does not raise an ExpectationNotFoundError if an #it block does contain an expectation" do
+    @state.it("it") { MSpec.expectation }
+    @state.process
+    ScratchPad.recorded.should be_nil
+  end
+end
+
+describe ContextState, "#process" do
+  before :each do
+    MSpec.store :example, []
+
+    @state = ContextState.new
+    @state.describe("") { }
+
+    example = mock("example")
+    def example.example(state, spec)
+      ScratchPad << state << spec
+    end
+    MSpec.register :example, example
+
+    ScratchPad.record []
+  end
+
+  after :each do
+    MSpec.store :example, nil
+  end
+
+  it "calls registered example actions with the current ExampleState and block" do
+    @state.it("") { MSpec.expectation }
+    @state.process
+
+    ScratchPad.recorded.first.should be_kind_of(ExampleState)
+    ScratchPad.recorded.last.should be_kind_of(Proc)
+  end
+
+  it "does not call registered example actions if the example has no block" do
+    @state.it("empty example")
+    @state.process
+    ScratchPad.recorded.should == []
+  end
+end
+
+describe ContextState, "#process" do
+  before :each do
+    MSpec.store :before, []
+    MSpec.store :after, []
+
+    @state = ContextState.new
+    @state.describe("") { }
+    @state.it("") { MSpec.expectation }
+  end
+
+  after :each do
+    MSpec.store :before, nil
+    MSpec.store :after, nil
+  end
+
+  it "calls registered before actions with the current ExampleState instance" do
+    before = mock("before")
+    before.should_receive(:before).and_return {
+      ScratchPad.record :before
+      @spec_state = @state.state
+    }
+    MSpec.register :before, before
+    @state.process
+    ScratchPad.recorded.should == :before
+    @spec_state.should be_kind_of(ExampleState)
+  end
+
+  it "calls registered after actions with the current ExampleState instance" do
+    after = mock("after")
+    after.should_receive(:after).and_return {
+      ScratchPad.record :after
+      @spec_state = @state.state
+    }
+    MSpec.register :after, after
+    @state.process
+    ScratchPad.recorded.should == :after
+    @spec_state.should be_kind_of(ExampleState)
+  end
+end
+
+describe ContextState, "#process" do
+end
+
+describe ContextState, "#process" do
+  before :each do
+    MSpec.store :enter, []
+    MSpec.store :leave, []
+
+    @state = ContextState.new
+    @state.describe("") { }
+    @state.it("") { MSpec.expectation }
+  end
+
+  after :each do
+    MSpec.store :enter, nil
+    MSpec.store :leave, nil
+  end
+
+  it "calls registered enter actions with the current #describe string" do
+    enter = mock("enter")
+    enter.should_receive(:enter).and_return { ScratchPad.record :enter }
+    MSpec.register :enter, enter
+    @state.process
+    ScratchPad.recorded.should == :enter
+  end
+
+  it "calls registered leave actions" do
+    leave = mock("leave")
+    leave.should_receive(:leave).and_return { ScratchPad.record :leave }
+    MSpec.register :leave, leave
+    @state.process
+    ScratchPad.recorded.should == :leave
+  end
+end
+
+describe ContextState, "#process when an exception is raised in before(:all)" do
   before :each do
     MSpec.store :before, []
     MSpec.store :after, []
@@ -231,70 +354,68 @@ describe ContextState, "#process in pretend mode" do
     @a = lambda { ScratchPad << :a }
     @b = lambda { ScratchPad << :b }
     ScratchPad.record []
+
+    @state.before(:all) { raise Exception, "Fail!" }
   end
 
-  it "does not call any before(:all) block" do
-    @state.before(:all, &@a)
-    @state.before(:all, &@b)
-    @state.it("") { }
-    @state.process
-    ScratchPad.recorded.should == []
+  after :each do
+    MSpec.store :before, nil
+    MSpec.store :after, nil
   end
 
-  it "does not call any after(:all) block" do
-    @state.after(:all, &@a)
-    @state.after(:all, &@b)
+  it "does not call before(:each)" do
+    @state.before(:each, &@a)
     @state.it("") { }
     @state.process
     ScratchPad.recorded.should == []
   end
 
-  it "does not call any it block" do
+  it "does not call the it block" do
     @state.it("one", &@a)
-    @state.it("two", &@b)
     @state.process
     ScratchPad.recorded.should == []
   end
 
-  it "does not call any before(:each) block" do
-    @state.before(:each, &@a)
-    @state.before(:each, &@b)
+  it "does not call after(:each)" do
+    @state.after(:each, &@a)
     @state.it("") { }
     @state.process
     ScratchPad.recorded.should == []
   end
 
-  it "does not call any after(:each) block" do
-    @state.after(:each, &@a)
-    @state.after(:each, &@b)
+  it "does not call after(:each)" do
+    @state.after(:all, &@a)
     @state.it("") { }
     @state.process
     ScratchPad.recorded.should == []
   end
 
-  it "does not call Mock.cleanup" do
-    @state.it("") { }
+  it "does not call Mock.verify_count" do
     @state.it("") { }
-    Mock.should_not_receive(:cleanup)
+    Mock.should_not_receive(:verify_count)
     @state.process
   end
 
-  it "calls the describe block" do
-    ScratchPad.record []
-    @state.describe(Object, "msg") { ScratchPad << :a }
+  it "calls Mock.cleanup" do
+    @state.it("") { }
+    Mock.should_receive(:cleanup)
     @state.process
-    ScratchPad.recorded.should == [:a]
   end
 end
 
-describe ContextState, "#process" do
+describe ContextState, "#process when an exception is raised in before(:each)" do
   before :each do
     MSpec.store :before, []
     MSpec.store :after, []
 
     @state = ContextState.new
     @state.describe("") { }
-    @state.it("") { }
+
+    @a = lambda { ScratchPad << :a }
+    @b = lambda { ScratchPad << :b }
+    ScratchPad.record []
+
+    @state.before(:each) { raise Exception, "Fail!" }
   end
 
   after :each do
@@ -302,28 +423,23 @@ describe ContextState, "#process" do
     MSpec.store :after, nil
   end
 
-  it "calls registered before actions with the current ExampleState instance" do
-    before = mock("before")
-    before.should_receive(:before).and_return {
-      ScratchPad.record :before
-      @spec_state = @state.state
-    }
-    MSpec.register :before, before
+  it "does not call the it block" do
+    @state.it("one", &@a)
     @state.process
-    ScratchPad.recorded.should == :before
-    @spec_state.should be_kind_of(ExampleState)
+    ScratchPad.recorded.should == []
   end
 
-  it "calls registered after actions with the current ExampleState instance" do
-    after = mock("after")
-    after.should_receive(:after).and_return {
-      ScratchPad.record :after
-      @spec_state = @state.state
-    }
-    MSpec.register :after, after
+  it "does not call after(:each)" do
+    @state.after(:each, &@a)
+    @state.it("") { }
+    @state.process
+    ScratchPad.recorded.should == []
+  end
+
+  it "does not call Mock.verify_count" do
+    @state.it("") { }
+    Mock.should_not_receive(:verify_count)
     @state.process
-    ScratchPad.recorded.should == :after
-    @spec_state.should be_kind_of(ExampleState)
   end
 end
 
@@ -337,6 +453,7 @@ describe ContextState, "#process in pretend mode" do
   end
 
   before :each do
+    ScratchPad.clear
     MSpec.store :before, []
     MSpec.store :after, []
 
@@ -375,35 +492,78 @@ describe ContextState, "#process in pretend mode" do
   end
 end
 
-describe ContextState, "#process" do
+describe ContextState, "#process in pretend mode" do
+  before :all do
+    MSpec.register_mode :pretend
+  end
+
+  after :all do
+    MSpec.register_mode nil
+  end
+
   before :each do
-    MSpec.store :enter, []
-    MSpec.store :leave, []
+    MSpec.store :before, []
+    MSpec.store :after, []
 
     @state = ContextState.new
     @state.describe("") { }
+
+    @a = lambda { ScratchPad << :a }
+    @b = lambda { ScratchPad << :b }
+    ScratchPad.record []
+  end
+
+  it "calls the describe block" do
+    ScratchPad.record []
+    @state.describe(Object, "msg") { ScratchPad << :a }
+    @state.process
+    ScratchPad.recorded.should == [:a]
+  end
+
+  it "does not call any before(:all) block" do
+    @state.before(:all, &@a)
+    @state.before(:all, &@b)
     @state.it("") { }
+    @state.process
+    ScratchPad.recorded.should == []
   end
 
-  after :each do
-    MSpec.store :enter, nil
-    MSpec.store :leave, nil
+  it "does not call any after(:all) block" do
+    @state.after(:all, &@a)
+    @state.after(:all, &@b)
+    @state.it("") { }
+    @state.process
+    ScratchPad.recorded.should == []
   end
 
-  it "calls registered enter actions with the current #describe string" do
-    enter = mock("enter")
-    enter.should_receive(:enter).and_return { ScratchPad.record :enter }
-    MSpec.register :enter, enter
+  it "does not call any it block" do
+    @state.it("one", &@a)
+    @state.it("two", &@b)
     @state.process
-    ScratchPad.recorded.should == :enter
+    ScratchPad.recorded.should == []
   end
 
-  it "calls registered leave actions" do
-    leave = mock("leave")
-    leave.should_receive(:leave).and_return { ScratchPad.record :leave }
-    MSpec.register :leave, leave
+  it "does not call any before(:each) block" do
+    @state.before(:each, &@a)
+    @state.before(:each, &@b)
+    @state.it("") { }
+    @state.process
+    ScratchPad.recorded.should == []
+  end
+
+  it "does not call any after(:each) block" do
+    @state.after(:each, &@a)
+    @state.after(:each, &@b)
+    @state.it("") { }
+    @state.process
+    ScratchPad.recorded.should == []
+  end
+
+  it "does not call Mock.cleanup" do
+    @state.it("") { }
+    @state.it("") { }
+    Mock.should_not_receive(:cleanup)
     @state.process
-    ScratchPad.recorded.should == :leave
   end
 end
 

data/spec/runner/exception_spec.rb

@@ -70,7 +70,12 @@ describe ExceptionState, "#failure?" do
     exc.failure?.should be_true
   end
 
-  it "returns false if the exception is not an ExpectationNotMetError" do
+  it "returns true if the exception is an ExpectationNotFoundError" do
+    exc = ExceptionState.new @state, "", ExpectationNotFoundError.new("Fail!")
+    exc.failure?.should be_true
+  end
+
+  it "returns false if the exception is not an ExpectationNotMetError or an ExpectationNotFoundError" do
     exc = ExceptionState.new @state, "", Exception.new("Fail!")
     exc.failure?.should be_false
   end
@@ -82,12 +87,18 @@ describe ExceptionState, "#message" do
     exc.message.should == "<No message>"
   end
 
-  it "returns the message without exception class when the exception is ExpectationNotMetError" do
+  it "returns the message without exception class when the exception is an ExpectationNotMetError" do
     exc = ExceptionState.new @state, "", ExpectationNotMetError.new("Fail!")
     exc.message.should == "Fail!"
   end
 
-  it "returns the message with exception class when the exception is not ExpectationNotMetError" do
+  it "returns ExpectationNotFoundError#message when the exception is an ExpectationNotFoundError" do
+    e = ExpectationNotFoundError.new
+    exc = ExceptionState.new @state, "", e
+    exc.message.should == e.message
+  end
+
+  it "returns the message with exception class when the exception is not an ExpectationNotMetError or an ExpectationNotFoundError" do
     exc = ExceptionState.new @state, "", Exception.new("Fail!")
     exc.message.should == "Exception: Fail!"
   end
@@ -95,16 +106,25 @@ end
 
 describe ExceptionState, "#backtrace" do
   before :each do
-    begin
-      raise Exception, "mock backtrace"
-    rescue Exception => @exception
+    @action = mock("action")
+    def @action.exception(exc)
+      ScratchPad.record exc.exception
     end
+    MSpec.register :exception, @action
+
+    ScratchPad.clear
+    MSpec.protect("") { raise Exception }
+
+    @exc = ExceptionState.new @state, "", ScratchPad.recorded
   end
 
   it "returns a string representation of the exception backtrace" do
-    exc = ExceptionState.new @state, "", @exception
-    exc.backtrace.should be_kind_of(String)
+    @exc.backtrace.should be_kind_of(String)
   end
 
-  # TODO: spec the filtering of the backtrace so mspec files don't display
+  it "strips MSpec files from the backtrace" do
+    @exc.backtrace.split("\n").each do |line|
+      line.should_not =~ ExceptionState::PATH
+    end
+  end
 end

data/spec/runner/mspec_spec.rb

@@ -389,3 +389,33 @@ benchmark(0.01825):The#fastest method today
     File.exist?(tmp("tags.txt")).should == false
   end
 end
+
+describe MSpec, ".expectation" do
+  it "sets the flag that an expectation has been reported" do
+    MSpec.clear_expectations
+    MSpec.expectation?.should be_false
+    MSpec.expectation
+    MSpec.expectation?.should be_true
+  end
+end
+
+describe MSpec, ".expectation?" do
+  it "returns true if an expectation has been reported" do
+    MSpec.expectation
+    MSpec.expectation?.should be_true
+  end
+
+  it "returns false if an expectation has not been reported" do
+    MSpec.clear_expectations
+    MSpec.expectation?.should be_false
+  end
+end
+
+describe MSpec, ".clear_expectations" do
+  it "clears the flag that an expectation has been reported" do
+    MSpec.expectation
+    MSpec.expectation?.should be_true
+    MSpec.clear_expectations
+    MSpec.expectation?.should be_false
+  end
+end

metadata

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