mspec 1.1.1 → 1.2.0

data/spec/runner/actions/tally_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require 'mspec/expectations/expectations'
 require 'mspec/runner/actions/tally'
 require 'mspec/runner/mspec'
-require 'mspec/runner/state'
+require 'mspec/runner/example'
 
 describe Tally do
   before :each do
@@ -56,9 +56,7 @@ end
 describe TallyAction do
   before :each do
     @tally = TallyAction.new
-    @state = SpecState.new("describe", "it")
-    @state.exceptions << ["msg", Exception.new("it broke")]
-    @state.exceptions << ["msg", ExpectationNotMetError.new("disappointment")]
+    @state = ExampleState.new("describe", "it")
   end
 
   it "responds to #counter by returning the Tally object" do
@@ -75,11 +73,29 @@ describe TallyAction do
     @tally.counter.expectations.should == 1
   end
 
-  it "responds to #after by incrementing counts returned by Tally#examples, #failures, #errors" do
+  it "responds to #after by incrementing counts returned by Tally#examples" do
     @tally.after @state
     @tally.counter.examples.should == 1
     @tally.counter.expectations.should == 0
+    @tally.counter.failures.should == 0
+    @tally.counter.errors.should == 0
+  end
+
+  it "responds to #exception by incrementing counts returned by Tally#failures" do
+    exc = ExceptionState.new nil, nil, ExpectationNotMetError.new("Failed!")
+    @tally.exception exc
+    @tally.counter.examples.should == 0
+    @tally.counter.expectations.should == 0
     @tally.counter.failures.should == 1
+    @tally.counter.errors.should == 0
+  end
+
+  it "responds to #exception by incrementing counts returned by Tally#errors" do
+    exc = ExceptionState.new nil, nil, Exception.new("Error!")
+    @tally.exception exc
+    @tally.counter.examples.should == 0
+    @tally.counter.expectations.should == 0
+    @tally.counter.failures.should == 0
     @tally.counter.errors.should == 1
   end
 
@@ -88,18 +104,22 @@ describe TallyAction do
     @tally.after @state
     @tally.expectation @state
     @tally.expectation @state
-    @tally.format.should == "1 file, 1 example, 2 expectations, 1 failure, 1 error"
+    exc = ExceptionState.new nil, nil, ExpectationNotMetError.new("Failed!")
+    @tally.exception exc
+    @tally.format.should == "1 file, 1 example, 2 expectations, 1 failure, 0 errors"
   end
 
   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(:exception, @tally)
     MSpec.should_receive(:register).with(:expectation, @tally)
     @tally.register
   end
 
   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(:expectation, @tally)
     @tally.unregister

data/spec/runner/{state_spec.rb → context_spec.rb}

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/matchers/base'
 require 'mspec/runner/mspec'
 require 'mspec/mocks/mock'
-require 'mspec/runner/state'
+require 'mspec/runner/context'
 
-describe RunState do
+describe ContextState do
   before :each do
-    @state = RunState.new
+    @state = ContextState.new
     @proc = lambda { }
   end
 
@@ -44,44 +44,68 @@ describe RunState do
   end
 end
 
-describe RunState, "#protect" do
-  it "calls MSpec.protect" do
+describe ContextState, "#protect" do
+  before :each do
     ScratchPad.record []
-    a = lambda { ScratchPad << :a }
-    b = lambda { ScratchPad << :b }
-    RunState.new.protect("message", [a, b])
+    @a = lambda { ScratchPad << :a }
+    @b = lambda { ScratchPad << :b }
+    @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
+    MSpec.stub!(:pretend_mode?).and_return(true)
+    ContextState.new.protect("message", [@a, @b]).should be_false
+    ScratchPad.recorded.should == []
+  end
+
+  it "executes the blocks if MSpec.pretend_mode? is false" do
+    MSpec.stub!(:pretend_mode?).and_return(false)
+    ContextState.new.protect("message", [@a, @b])
+    ScratchPad.recorded.should == [:a, :b]
+  end
+
+  it "executes the blocks if check is false" do
+    ContextState.new.protect("message", [@a, @b], false)
     ScratchPad.recorded.should == [:a, :b]
   end
+
+  it "returns true if none of the blocks raise an exception" do
+    ContextState.new.protect("message", [@a, @b]).should be_true
+  end
+
+  it "returns false if any of the blocks raise an exception" do
+    ContextState.new.protect("message", [@a, @c, @b]).should be_false
+  end
 end
 
-describe RunState, "#state" do
+describe ContextState, "#state" do
   before :each do
     MSpec.store :before, []
     MSpec.store :after, []
 
-    @state = RunState.new
+    @state = ContextState.new
   end
 
   it "returns nil if no spec is being executed" do
     @state.state.should == nil
   end
 
-  it "returns a SpecState instance if a spec is being executed" do
+  it "returns a ExampleState instance if an example is being executed" do
     ScratchPad.record @state
     @state.describe("") { }
     @state.it("") { ScratchPad.record ScratchPad.recorded.state }
     @state.process
     @state.state.should == nil
-    ScratchPad.recorded.should be_kind_of(SpecState)
+    ScratchPad.recorded.should be_kind_of(ExampleState)
   end
 end
 
-describe RunState, "#process" do
+describe ContextState, "#process" do
   before :each do
     MSpec.store :before, []
     MSpec.store :after, []
 
-    @state = RunState.new
+    @state = ContextState.new
     @state.describe("") { }
 
     @a = lambda { ScratchPad << :a }
@@ -112,6 +136,13 @@ describe RunState, "#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)
@@ -128,6 +159,14 @@ describe RunState, "#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("") { }
@@ -142,6 +181,13 @@ describe RunState, "#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 }
@@ -149,23 +195,12 @@ describe RunState, "#process" do
     ScratchPad.recorded.should == [:a]
   end
 
-  it "creates a new SpecState instance for each spec" do
+  it "creates a new ExampleState instance for each example" do
     ScratchPad.record @state
     @state.describe("desc") { }
     @state.it("it") { ScratchPad.record ScratchPad.recorded.state }
     @state.process
-    ScratchPad.recorded.should be_kind_of(SpecState)
-  end
-
-  it "records exceptions that occur while running the spec" do
-    ScratchPad.record @state
-    exception = Exception.new("bump!")
-    MSpec.stack.push @state
-    @state.describe("describe") { }
-    @state.it("it") { raise exception }
-    @state.after(:each) { ScratchPad.record ScratchPad.recorded.state.exceptions }
-    @state.process
-    ScratchPad.recorded.should == [[nil, exception]]
+    ScratchPad.recorded.should be_kind_of(ExampleState)
   end
 
   it "shuffles the spec list if MSpec.randomize? is true" do
@@ -177,7 +212,7 @@ describe RunState, "#process" do
   end
 end
 
-describe RunState, "#process in pretend mode" do
+describe ContextState, "#process in pretend mode" do
   before :all do
     MSpec.register_mode :pretend
   end
@@ -190,7 +225,7 @@ describe RunState, "#process in pretend mode" do
     MSpec.store :before, []
     MSpec.store :after, []
 
-    @state = RunState.new
+    @state = ContextState.new
     @state.describe("") { }
 
     @a = lambda { ScratchPad << :a }
@@ -252,12 +287,12 @@ describe RunState, "#process in pretend mode" do
   end
 end
 
-describe RunState, "#process" do
+describe ContextState, "#process" do
   before :each do
     MSpec.store :before, []
     MSpec.store :after, []
 
-    @state = RunState.new
+    @state = ContextState.new
     @state.describe("") { }
     @state.it("") { }
   end
@@ -267,7 +302,7 @@ describe RunState, "#process" do
     MSpec.store :after, nil
   end
 
-  it "calls registered before actions with the current SpecState instance" do
+  it "calls registered before actions with the current ExampleState instance" do
     before = mock("before")
     before.should_receive(:before).and_return {
       ScratchPad.record :before
@@ -276,10 +311,10 @@ describe RunState, "#process" do
     MSpec.register :before, before
     @state.process
     ScratchPad.recorded.should == :before
-    @spec_state.should be_kind_of(SpecState)
+    @spec_state.should be_kind_of(ExampleState)
   end
 
-  it "calls registered after actions with the current SpecState instance" do
+  it "calls registered after actions with the current ExampleState instance" do
     after = mock("after")
     after.should_receive(:after).and_return {
       ScratchPad.record :after
@@ -288,11 +323,11 @@ describe RunState, "#process" do
     MSpec.register :after, after
     @state.process
     ScratchPad.recorded.should == :after
-    @spec_state.should be_kind_of(SpecState)
+    @spec_state.should be_kind_of(ExampleState)
   end
 end
 
-describe RunState, "#process in pretend mode" do
+describe ContextState, "#process in pretend mode" do
   before :all do
     MSpec.register_mode :pretend
   end
@@ -305,7 +340,7 @@ describe RunState, "#process in pretend mode" do
     MSpec.store :before, []
     MSpec.store :after, []
 
-    @state = RunState.new
+    @state = ContextState.new
     @state.describe("") { }
     @state.it("") { }
   end
@@ -315,7 +350,7 @@ describe RunState, "#process in pretend mode" do
     MSpec.store :after, nil
   end
 
-  it "calls registered before actions with the current SpecState instance" do
+  it "calls registered before actions with the current ExampleState instance" do
     before = mock("before")
     before.should_receive(:before).and_return {
       ScratchPad.record :before
@@ -324,10 +359,10 @@ describe RunState, "#process in pretend mode" do
     MSpec.register :before, before
     @state.process
     ScratchPad.recorded.should == :before
-    @spec_state.should be_kind_of(SpecState)
+    @spec_state.should be_kind_of(ExampleState)
   end
 
-  it "calls registered after actions with the current SpecState instance" do
+  it "calls registered after actions with the current ExampleState instance" do
     after = mock("after")
     after.should_receive(:after).and_return {
       ScratchPad.record :after
@@ -336,16 +371,16 @@ describe RunState, "#process in pretend mode" do
     MSpec.register :after, after
     @state.process
     ScratchPad.recorded.should == :after
-    @spec_state.should be_kind_of(SpecState)
+    @spec_state.should be_kind_of(ExampleState)
   end
 end
 
-describe RunState, "#process" do
+describe ContextState, "#process" do
   before :each do
     MSpec.store :enter, []
     MSpec.store :leave, []
 
-    @state = RunState.new
+    @state = ContextState.new
     @state.describe("") { }
     @state.it("") { }
   end
@@ -372,7 +407,7 @@ describe RunState, "#process" do
   end
 end
 
-describe RunState, "#process in pretend mode" do
+describe ContextState, "#process in pretend mode" do
   before :all do
     MSpec.register_mode :pretend
   end
@@ -385,7 +420,7 @@ describe RunState, "#process in pretend mode" do
     MSpec.store :enter, []
     MSpec.store :leave, []
 
-    @state = RunState.new
+    @state = ContextState.new
     @state.describe("") { }
     @state.it("") { }
   end
@@ -411,125 +446,3 @@ describe RunState, "#process in pretend mode" do
     ScratchPad.recorded.should == :leave
   end
 end
-
-describe SpecState do
-  it "is initialized with the describe and it strings" do
-    SpecState.new("This", "does").should be_kind_of(SpecState)
-  end
-end
-
-describe SpecState, "#describe" do
-  before :each do
-    @state = SpecState.new("describe", "it")
-  end
-
-  it "returns the arguments to the #describe block stringified and concatenated" do
-    @state.describe.should == "describe"
-  end
-end
-
-describe SpecState, "#it" do
-  before :each do
-    @state = SpecState.new("describe", "it")
-  end
-
-  it "returns the argument to the #it block" do
-    @state.it.should == "it"
-  end
-end
-
-describe SpecState, "#exceptions" do
-  before :each do
-    @state = SpecState.new("describe", "it")
-  end
-
-  it "returns an array" do
-    @state.exceptions.should be_kind_of(Array)
-  end
-end
-
-describe SpecState, "#exception?" do
-  before :each do
-    @state = SpecState.new("describe", "it")
-  end
-
-  it "returns false if no exceptions were recorded" do
-    @state.exception?.should == false
-  end
-
-  it "returns true if any exceptions were recorded" do
-    @state.exceptions.push :a
-    @state.exception?.should == true
-  end
-end
-
-describe SpecState, "#unfiltered?" do
-  before :each do
-    MSpec.store :include, nil
-    MSpec.store :exclude, nil
-
-    @state = SpecState.new("describe", "it")
-    @filter = mock("filter")
-  end
-
-  it "returns true if MSpec include filters list is empty" do
-    @state.unfiltered?.should == true
-  end
-
-  it "returns true if MSpec include filters match this spec" do
-    @filter.should_receive(:===).and_return(true)
-    MSpec.register :include, @filter
-    @state.unfiltered?.should == true
-  end
-
-  it "returns false if MSpec include filters do not match this spec" do
-    @filter.should_receive(:===).and_return(false)
-    MSpec.register :include, @filter
-    @state.unfiltered?.should == false
-  end
-
-  it "returns true if MSpec exclude filters list is empty" do
-    @state.unfiltered?.should == true
-  end
-
-  it "returns true if MSpec exclude filters do not match this spec" do
-    @filter.should_receive(:===).and_return(false)
-    MSpec.register :exclude, @filter
-    @state.unfiltered?.should == true
-  end
-
-  it "returns false if MSpec exclude filters match this spec" do
-    @filter.should_receive(:===).and_return(true)
-    MSpec.register :exclude, @filter
-    @state.unfiltered?.should == false
-  end
-
-  it "returns false if MSpec include and exclude filters match this spec" do
-    @filter.should_receive(:===).twice.and_return(true)
-    MSpec.register :include, @filter
-    MSpec.register :exclude, @filter
-    @state.unfiltered?.should == false
-  end
-end
-
-describe SpecState, "#filtered?" do
-  before :each do
-    @state = SpecState.new("describe", "it")
-  end
-
-  it "returns true if #unfiltered returns false" do
-    @state.should_receive(:unfiltered?).and_return(false)
-    @state.filtered?.should == true
-  end
-
-  it "returns false if #unfiltered returns true" do
-    @state.should_receive(:unfiltered?).and_return(true)
-    @state.filtered?.should == false
-  end
-end
-
-describe SpecState, "#failure?" do
-  before :each do
-    @state = SpecState.new("describe", "it")
-  end
-end