mspec 1.1.1 → 1.2.0

data/spec/runner/formatters/specdoc_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'mspec/runner/formatters/specdoc'
-require 'mspec/runner/state'
+require 'mspec/runner/example'
 
 describe SpecdocFormatter do
   before :each do
@@ -30,28 +30,68 @@ describe SpecdocFormatter, "#enter" do
   end
 end
 
-describe SpecdocFormatter, "#after" do
+describe SpecdocFormatter, "#before" do
   before :each do
     $stdout = @out = IOStub.new
     @formatter = SpecdocFormatter.new
-    @state = SpecState.new("describe", "it")
+    @state = ExampleState.new "describe", "it"
   end
 
   after :each do
     $stdout = STDOUT
   end
 
-  it "prints the #it once when there are no exceptions raised" do
-    @formatter.after @state
-    @out.should == "- it\n"
+  it "prints the #it string" do
+    @formatter.before @state
+    @out.should == "- it"
   end
+end
 
-  it "prints the #it string once for each exception raised" do
-    @formatter.register
-    @state.exceptions << ["msg", ExpectationNotMetError.new("disappointing")]
-    @state.exceptions << ["msg", Exception.new("painful")]
-    @formatter.tally.after @state
+describe SpecdocFormatter, "#exception" do
+  before :each do
+    $stdout = @out = IOStub.new
+    @formatter = SpecdocFormatter.new
+    @state = ExampleState.new "describe", "it"
+  end
+
+  after :each do
+    $stdout = STDOUT
+  end
+
+  it "prints 'ERROR' if an exception is not an ExpectationNotMetError" do
+    exc = ExceptionState.new @state, nil, MSpecExampleError.new("painful")
+    @formatter.exception exc
+    @out.should == " (ERROR - 1)"
+  end
+
+  it "prints 'FAILED' if an exception is an ExpectationNotMetError" do
+    exc = ExceptionState.new @state, nil, ExpectationNotMetError.new("disappointing")
+    @formatter.exception exc
+    @out.should == " (FAILED - 1)"
+  end
+
+  it "prints the #it string if an exception has already been raised" do
+    exc = ExceptionState.new @state, nil, ExpectationNotMetError.new("disappointing")
+    @formatter.exception exc
+    exc = ExceptionState.new @state, nil, MSpecExampleError.new("painful")
+    @formatter.exception exc
+    @out.should == " (FAILED - 1)\n- it (ERROR - 2)"
+  end
+end
+
+describe SpecdocFormatter, "#after" do
+  before :each do
+    $stdout = @out = IOStub.new
+    @formatter = SpecdocFormatter.new
+    @state = ExampleState.new "describe", "it"
+  end
+
+  after :each do
+    $stdout = STDOUT
+  end
+
+  it "prints a newline character" do
     @formatter.after @state
-    @out.should == "- it (FAILED - 1)\n- it (ERROR - 2)\n"
+    @out.should == "\n"
   end
 end

data/spec/runner/formatters/spinner_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'mspec/runner/formatters/spinner'
 require 'mspec/runner/mspec'
-require 'mspec/runner/state'
+require 'mspec/runner/example'
 
 describe SpinnerFormatter, "#initialize" do
   it "permits zero arguments" do
@@ -58,7 +58,7 @@ describe SpinnerFormatter, "#after" do
     MSpec.stub!(:retrieve).and_return(["a", "b"])
     @formatter = SpinnerFormatter.new
     @formatter.register
-    @state = SpecState.new("describe", "it")
+    @state = ExampleState.new("describe", "it")
   end
 
   after :each do

data/spec/runner/formatters/summary_spec.rb

@@ -1,12 +1,13 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'mspec/runner/formatters/summary'
-require 'mspec/runner/state'
+require 'mspec/runner/example'
 
 describe SummaryFormatter, "#after" do
   before :each do
     $stdout = @out = IOStub.new
     @formatter = SummaryFormatter.new
-    @state = SpecState.new("describe", "it")
+    @formatter.register
+    @state = ExampleState.new("describe", "it")
   end
 
   after :each do
@@ -14,15 +15,10 @@ describe SummaryFormatter, "#after" do
   end
 
   it "does not print anything" do
-    MSpec.stub!(:register)
-    tally = mock("tally", :null_object => true)
-    tally.stub!(:failures).and_return(1)
-    tally.stub!(:errors).and_return(1)
-    TallyAction.stub!(:new).and_return(tally)
-
-    @formatter.register
-    @state.exceptions << ExpectationNotMetError.new("disappointing")
-    @state.exceptions << Exception.new("painful")
+    exc = ExceptionState.new @state, nil, ExpectationNotMetError.new("disappointing")
+    @formatter.exception exc
+    exc = ExceptionState.new @state, nil, MSpecExampleError.new("painful")
+    @formatter.exception exc
     @formatter.after(@state)
     @out.should == ""
   end

data/spec/runner/formatters/unit_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'mspec/runner/formatters/unit'
-require 'mspec/runner/state'
+require 'mspec/runner/example'
 
 describe UnitdiffFormatter, "#finish" do
   before :each do
@@ -10,7 +10,7 @@ describe UnitdiffFormatter, "#finish" do
     TimerAction.stub!(:new).and_return(@timer)
 
     $stdout = @out = IOStub.new
-    @state = SpecState.new("describe", "it")
+    @state = ExampleState.new("describe", "it")
     MSpec.stub!(:register)
     @formatter = UnitdiffFormatter.new
     @formatter.register
@@ -21,16 +21,17 @@ describe UnitdiffFormatter, "#finish" do
   end
 
   it "prints a failure message for an exception" do
-    @state.exceptions << ["msg", Exception.new("broken")]
+    exc = ExceptionState.new @state, nil, MSpecExampleError.new("broken")
+    @formatter.exception exc
     @formatter.after @state
     @formatter.finish
     @out.should =~ /^1\)\ndescribe it ERROR$/
   end
 
   it "prints a backtrace for an exception" do
-    @formatter.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
-    @state.exceptions << ["msg", Exception.new("broken")]
-    @formatter.after @state
+    exc = ExceptionState.new @state, nil, Exception.new("broken")
+    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    @formatter.exception exc
     @formatter.finish
     @out.should =~ %r[path/to/some/file.rb:35:in method$]
   end
@@ -48,11 +49,12 @@ describe UnitdiffFormatter, "#finish" do
   end
 
   it "prints errors, backtraces, elapsed time, and tallies" do
-    @state.exceptions << ["msg", Exception.new("broken")]
-    @formatter.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    exc = ExceptionState.new @state, nil, Exception.new("broken")
+    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    @formatter.exception exc
+    @formatter.after @state
     @timer.should_receive(:format).and_return("Finished in 2.0 seconds")
     @tally.should_receive(:format).and_return("1 example, 0 failures")
-    @formatter.after @state
     @formatter.finish
     @out.should ==
 %[E
@@ -61,8 +63,7 @@ Finished in 2.0 seconds
 
 1)
 describe it ERROR
-Exception occurred during: msg
-broken: 
+Exception: broken: 
 path/to/some/file.rb:35:in method
 
 1 example, 0 failures

data/spec/runner/formatters/yaml_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'mspec/runner/formatters/yaml'
-require 'mspec/runner/state'
+require 'mspec/runner/example'
 
 describe YamlFormatter, "#initialize" do
   it "permits zero arguments" do
@@ -57,13 +57,16 @@ describe YamlFormatter, "#finish" do
     TimerAction.stub!(:new).and_return(@timer)
 
     $stdout = IOStub.new
-    @state = SpecState.new("describe", "it")
-    @state.exceptions << ["msg", MSpecExampleError.new("broken")]
+    @state = ExampleState.new("describe", "it")
 
     @formatter = YamlFormatter.new
     @formatter.stub!(:backtrace).and_return("")
     MSpec.stub!(:register)
     @formatter.register
+
+    exc = ExceptionState.new @state, nil, MSpecExampleError.new("broken")
+    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    @formatter.exception exc
     @formatter.after @state
   end
 
@@ -77,11 +80,9 @@ describe YamlFormatter, "#finish" do
   end
 
   it "outputs a failure message and backtrace" do
-    @formatter.should_receive(:backtrace).and_return("path/to/some/file.rb:35:in method")
     @formatter.finish
     $stdout.should =~ /describe it ERROR/
-    $stdout.should =~ /MSpecExampleError occurred during: msg/
-    $stdout.should =~ /MSpecExampleError: broken/
+    $stdout.should =~ /MSpecExampleError: broken\\n/
     $stdout.should =~ %r[path/to/some/file.rb:35:in method]
   end
 

data/spec/runner/mspec_spec.rb

@@ -87,39 +87,38 @@ end
 
 describe MSpec, ".protect" do
   before :each do
-    @ss = mock('SpecState')
-    @ss.stub!(:exceptions).and_return([])
-    @rs = mock('RunState')
-    @rs.stub!(:state).and_return(@ss)
-    @exception = Exception.new("Sharp!")
-    ScratchPad.record @exception
+    MSpec.stack.clear
+    @es = ExampleState.new "C#m", "runs"
+    @cs = ContextState.new
+    @cs.stub!(:state).and_return(@es)
+    MSpec.stack.push @cs
+    ScratchPad.record Exception.new("Sharp!")
   end
 
-  it "rescues any exceptions raised when executing the block argument" do
-    MSpec.stack.push @rs
-    lambda {
-      MSpec.protect("") { raise Exception, "Now you see me..." }
-    }.should_not raise_error
+  it "returns true if no exception is raised" do
+    MSpec.protect("passed") { 1 }.should be_true
   end
 
-  it "records the exception in the current.state object's exceptions" do
-    MSpec.stack.push @rs
-    MSpec.protect("testing") { raise ScratchPad.recorded }
-    @ss.exceptions.should == [["testing", ScratchPad.recorded]]
+  it "returns false if an exception is raised" do
+    MSpec.protect("testing") { raise ScratchPad.recorded }.should be_false
   end
 
-  it "writes a message to STDERR if current is nil" do
-    STDERR.stub!(:write)
-    STDERR.should_receive(:write).with("\nAn exception occurred in testing:\nException: \"Sharp!\"\n")
-    MSpec.stack.clear
+  it "rescues any exceptions raised when evaluating the block argument" do
+    MSpec.protect("") { raise Exception, "Now you see me..." }
+  end
+
+  it "calls all the exception actions" do
+    exc = ExceptionState.new @es, "testing", ScratchPad.recorded
+    ExceptionState.stub!(:new).and_return(exc)
+    action = mock("exception")
+    action.should_receive(:exception).with(exc)
+    MSpec.register :exception, action
     MSpec.protect("testing") { raise ScratchPad.recorded }
+    MSpec.unregister :exception, action
   end
 
-  it "writes a message to STDERR if current.state is nil" do
-    STDERR.stub!(:write)
-    STDERR.should_receive(:write).with("\nAn exception occurred in testing:\nException: \"Sharp!\"\n")
-    @rs.stub!(:state).and_return(nil)
-    MSpec.stack.push @rs
+  it "registers a non-zero exit code when an exception is raised" do
+    MSpec.should_receive(:register_exit).with(1)
     MSpec.protect("testing") { raise ScratchPad.recorded }
   end
 end
@@ -193,17 +192,17 @@ describe MSpec, ".describe" do
 
   it "accepts one argument" do
     MSpec.describe(Object) { ScratchPad.record MSpec.current }
-    ScratchPad.recorded.should be_kind_of(RunState)
+    ScratchPad.recorded.should be_kind_of(ContextState)
   end
 
-  it "pushes a new RunState instance on the stack" do
+  it "pushes a new ContextState instance on the stack" do
     MSpec.describe(Object, "msg") { ScratchPad.record MSpec.current }
-    ScratchPad.recorded.should be_kind_of(RunState)
+    ScratchPad.recorded.should be_kind_of(ContextState)
   end
 
-  it "pops the RunState instance off the stack when finished" do
+  it "pops the ContextState instance off the stack when finished" do
     MSpec.describe(Object, "msg") { ScratchPad.record MSpec.current }
-    ScratchPad.recorded.should be_kind_of(RunState)
+    ScratchPad.recorded.should be_kind_of(ContextState)
     MSpec.stack.should == []
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Brian Ford
@@ -85,6 +85,9 @@ files:
 - lib/mspec/runner/actions/tally.rb
 - lib/mspec/runner/actions/timer.rb
 - lib/mspec/runner/actions.rb
+- lib/mspec/runner/context.rb
+- lib/mspec/runner/example.rb
+- lib/mspec/runner/exception.rb
 - lib/mspec/runner/filters/match.rb
 - lib/mspec/runner/filters/profile.rb
 - lib/mspec/runner/filters/regexp.rb
@@ -101,7 +104,6 @@ files:
 - lib/mspec/runner/mspec.rb
 - lib/mspec/runner/object.rb
 - lib/mspec/runner/shared.rb
-- lib/mspec/runner/state.rb
 - lib/mspec/runner/tag.rb
 - lib/mspec/runner.rb
 - lib/mspec/utils/name_map.rb
@@ -163,6 +165,9 @@ files:
 - spec/runner/actions/tag_spec.rb
 - spec/runner/actions/tally_spec.rb
 - spec/runner/actions/timer_spec.rb
+- spec/runner/context_spec.rb
+- spec/runner/example_spec.rb
+- spec/runner/exception_spec.rb
 - spec/runner/filters/match_spec.rb
 - spec/runner/filters/profile_spec.rb
 - spec/runner/filters/regexp_spec.rb
@@ -176,7 +181,6 @@ files:
 - spec/runner/formatters/yaml_spec.rb
 - spec/runner/mspec_spec.rb
 - spec/runner/shared_spec.rb
-- spec/runner/state_spec.rb
 - spec/runner/tag_spec.rb
 - spec/spec_helper.rb
 - spec/utils/name_map_spec.rb