mspec 1.3.1 → 1.4.0

data/spec/runner/example_spec.rb

@@ -5,24 +5,27 @@ require 'mspec/mocks/mock'
 require 'mspec/runner/example'
 
 describe ExampleState do
-  it "is initialized with the describe and it strings" do
-    ExampleState.new("This", "does").should be_kind_of(ExampleState)
+  it "is initialized with the ContextState, #it string, and #it block" do
+    prc = lambda { }
+    context = ContextState.new ""
+    ExampleState.new(context, "does", prc).should be_kind_of(ExampleState)
   end
 end
 
 describe ExampleState, "#describe" do
   before :each do
-    @state = ExampleState.new("describe", "it")
+    @context = ContextState.new Object, "#to_s"
+    @state = ExampleState.new @context, "it"
   end
 
-  it "returns the arguments to the #describe block stringified and concatenated" do
-    @state.describe.should == "describe"
+  it "returns the ContextState#description" do
+    @state.describe.should == @context.description
   end
 end
 
 describe ExampleState, "#it" do
   before :each do
-    @state = ExampleState.new("describe", "it")
+    @state = ExampleState.new ContextState.new("describe"), "it"
   end
 
   it "returns the argument to the #it block" do
@@ -30,67 +33,80 @@ describe ExampleState, "#it" do
   end
 end
 
-describe ExampleState, "#unfiltered?" do
+describe ExampleState, "#context=" do
+  before :each do
+    @state = ExampleState.new ContextState.new("describe"), "it"
+    @context = ContextState.new "New#context"
+  end
+
+  it "sets the containing ContextState" do
+    @state.context = @context
+    @state.context.should == @context
+  end
+
+  it "resets the description" do
+    @state.description.should == "describe it"
+    @state.context = @context
+    @state.description.should == "New#context it"
+  end
+end
+
+describe ExampleState, "#example" do
+  before :each do
+    @proc = lambda { }
+    @state = ExampleState.new ContextState.new("describe"), "it", @proc
+  end
+
+  it "returns the #it block" do
+    @state.example.should == @proc
+  end
+end
+
+describe ExampleState, "#filtered?" do
   before :each do
     MSpec.store :include, nil
     MSpec.store :exclude, nil
 
-    @state = ExampleState.new("describe", "it")
+    @state = ExampleState.new ContextState.new("describe"), "it"
     @filter = mock("filter")
   end
 
-  it "returns true if MSpec include filters list is empty" do
-    @state.unfiltered?.should == true
+  it "returns false if MSpec include filters list is empty" do
+    @state.filtered?.should == false
   end
 
-  it "returns true if MSpec include filters match this spec" do
+  it "returns false if MSpec include filters match this spec" do
     @filter.should_receive(:===).and_return(true)
     MSpec.register :include, @filter
-    @state.unfiltered?.should == true
+    @state.filtered?.should == false
   end
 
-  it "returns false if MSpec include filters do not match this spec" do
+  it "returns true if MSpec include filters do not match this spec" do
     @filter.should_receive(:===).and_return(false)
     MSpec.register :include, @filter
-    @state.unfiltered?.should == false
+    @state.filtered?.should == true
   end
 
-  it "returns true if MSpec exclude filters list is empty" do
-    @state.unfiltered?.should == true
+  it "returns false if MSpec exclude filters list is empty" do
+    @state.filtered?.should == false
   end
 
-  it "returns true if MSpec exclude filters do not match this spec" do
+  it "returns false if MSpec exclude filters do not match this spec" do
     @filter.should_receive(:===).and_return(false)
     MSpec.register :exclude, @filter
-    @state.unfiltered?.should == true
+    @state.filtered?.should == false
   end
 
-  it "returns false if MSpec exclude filters match this spec" do
+  it "returns true if MSpec exclude filters match this spec" do
     @filter.should_receive(:===).and_return(true)
     MSpec.register :exclude, @filter
-    @state.unfiltered?.should == false
+    @state.filtered?.should == true
   end
 
-  it "returns false if MSpec include and exclude filters match this spec" do
+  it "returns true 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 ExampleState, "#filtered?" do
-  before :each do
-    @state = ExampleState.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

data/spec/runner/exception_spec.rb

@@ -5,7 +5,8 @@ require 'mspec/runner/exception'
 
 describe ExceptionState, "#initialize" do
   it "takes a state, location (e.g. before :each), and exception" do
-    state = ExampleState.new "Class#method", "does something"
+    context = ContextState.new "Class#method"
+    state = ExampleState.new context, "does something"
     exc = Exception.new "Fail!"
     ExceptionState.new(state, "location", exc).should be_kind_of(ExceptionState)
   end
@@ -13,7 +14,8 @@ end
 
 describe ExceptionState, "#description" do
   before :each do
-    @state = ExampleState.new "Class#method", "does something"
+    context = ContextState.new "Class#method"
+    @state = ExampleState.new context, "does something"
   end
 
   it "returns the state description if state was not nil" do
@@ -34,7 +36,8 @@ end
 
 describe ExceptionState, "#describe" do
   before :each do
-    @state = ExampleState.new "Class#method", "does something"
+    context = ContextState.new "Class#method"
+    @state = ExampleState.new context, "does something"
   end
 
   it "returns the ExampleState#describe string if created with a non-nil state" do
@@ -48,7 +51,8 @@ end
 
 describe ExceptionState, "#it" do
   before :each do
-    @state = ExampleState.new "Class#method", "does something"
+    context = ContextState.new "Class#method"
+    @state = ExampleState.new context, "does something"
   end
 
   it "returns the ExampleState#it string if created with a non-nil state" do
@@ -62,7 +66,7 @@ end
 
 describe ExceptionState, "#failure?" do
   before :each do
-    @state = ExampleState.new "C#m", "works"
+    @state = ExampleState.new ContextState.new("C#m"), "works"
   end
 
   it "returns true if the exception is an ExpectationNotMetError" do

data/spec/runner/formatters/dotted_spec.rb

@@ -145,7 +145,7 @@ end
 
 describe DottedFormatter, "#before" do
   before :each do
-    @state = ExampleState.new("describe", "it")
+    @state = ExampleState.new ContextState.new("describe"), "it"
     @formatter = DottedFormatter.new
     @formatter.exception ExceptionState.new(nil, nil, ExpectationNotMetError.new("Failed!"))
   end
@@ -167,7 +167,7 @@ describe DottedFormatter, "#after" do
   before :each do
     $stdout = @out = IOStub.new
     @formatter = DottedFormatter.new
-    @state = ExampleState.new("describe", "it")
+    @state = ExampleState.new ContextState.new("describe"), "it"
   end
 
   after :each do
@@ -211,7 +211,8 @@ describe DottedFormatter, "#finish" do
     TimerAction.stub!(:new).and_return(@timer)
 
     $stdout = @out = IOStub.new
-    @state = ExampleState.new("Class#method", "runs")
+    context = ContextState.new "Class#method"
+    @state = ExampleState.new(context, "runs")
     MSpec.stub!(:register)
     @formatter = DottedFormatter.new
     @formatter.register

data/spec/runner/formatters/html_spec.rb

@@ -95,7 +95,7 @@ describe HtmlFormatter, "#exception" do
     $stdout = @out = IOStub.new
     @formatter = HtmlFormatter.new
     @formatter.register
-    @state = ExampleState.new("describe", "it")
+    @state = ExampleState.new ContextState.new("describe"), "it"
   end
 
   after :each do
@@ -119,7 +119,7 @@ describe HtmlFormatter, "#after" do
     $stdout = @out = IOStub.new
     @formatter = HtmlFormatter.new
     @formatter.register
-    @state = ExampleState.new("describe", "it")
+    @state = ExampleState.new ContextState.new("describe"), "it"
   end
 
   after :each do
@@ -148,7 +148,8 @@ describe HtmlFormatter, "#finish" do
     TimerAction.stub!(:new).and_return(@timer)
 
     $stdout = @out = IOStub.new
-    @state = ExampleState.new("describe", "it")
+    context = ContextState.new "describe"
+    @state = ExampleState.new(context, "it")
     MSpec.stub!(:register)
     @formatter = HtmlFormatter.new
     @formatter.register

data/spec/runner/formatters/specdoc_spec.rb

@@ -34,7 +34,7 @@ describe SpecdocFormatter, "#before" do
   before :each do
     $stdout = @out = IOStub.new
     @formatter = SpecdocFormatter.new
-    @state = ExampleState.new "describe", "it"
+    @state = ExampleState.new ContextState.new("describe"), "it"
   end
 
   after :each do
@@ -59,7 +59,8 @@ describe SpecdocFormatter, "#exception" do
   before :each do
     $stdout = @out = IOStub.new
     @formatter = SpecdocFormatter.new
-    @state = ExampleState.new "describe", "it"
+    context = ContextState.new "describe"
+    @state = ExampleState.new context, "it"
   end
 
   after :each do

data/spec/runner/formatters/summary_spec.rb

@@ -7,7 +7,8 @@ describe SummaryFormatter, "#after" do
     $stdout = @out = IOStub.new
     @formatter = SummaryFormatter.new
     @formatter.register
-    @state = ExampleState.new("describe", "it")
+    context = ContextState.new "describe"
+    @state = ExampleState.new(context, "it")
   end
 
   after :each do

data/spec/runner/formatters/unit_spec.rb

@@ -10,7 +10,8 @@ describe UnitdiffFormatter, "#finish" do
     TimerAction.stub!(:new).and_return(@timer)
 
     $stdout = @out = IOStub.new
-    @state = ExampleState.new("describe", "it")
+    context = ContextState.new "describe"
+    @state = ExampleState.new(context, "it")
     MSpec.stub!(:register)
     @formatter = UnitdiffFormatter.new
     @formatter.register

data/spec/runner/formatters/yaml_spec.rb

@@ -57,7 +57,8 @@ describe YamlFormatter, "#finish" do
     TimerAction.stub!(:new).and_return(@timer)
 
     $stdout = IOStub.new
-    @state = ExampleState.new("describe", "it")
+    context = ContextState.new "describe"
+    @state = ExampleState.new(context, "it")
 
     @formatter = YamlFormatter.new
     @formatter.stub!(:backtrace).and_return("")

data/spec/runner/mspec_spec.rb

@@ -87,11 +87,12 @@ end
 
 describe MSpec, ".protect" do
   before :each do
-    MSpec.stack.clear
-    @es = ExampleState.new "C#m", "runs"
-    @cs = ContextState.new
+    MSpec.clear_current
+    @cs = ContextState.new "C#m"
     @cs.stub!(:state).and_return(@es)
-    MSpec.stack.push @cs
+    @cs.parent = MSpec.current
+
+    @es = ExampleState.new @cs, "runs"
     ScratchPad.record Exception.new("Sharp!")
   end
 
@@ -107,6 +108,15 @@ describe MSpec, ".protect" do
     MSpec.protect("") { raise Exception, "Now you see me..." }
   end
 
+  it "does not rescue SystemExit" do
+    begin
+      MSpec.protect("") { exit 1 }
+    rescue SystemExit
+      ScratchPad.record :system_exit
+    end
+    ScratchPad.recorded.should == :system_exit
+  end
+
   it "calls all the exception actions" do
     exc = ExceptionState.new @es, "testing", ScratchPad.recorded
     ExceptionState.stub!(:new).and_return(exc)
@@ -123,18 +133,43 @@ describe MSpec, ".protect" do
   end
 end
 
-describe MSpec, ".stack" do
-  it "returns an array" do
-    MSpec.stack.should be_kind_of(Array)
+describe MSpec, ".register_current" do
+  before :each do
+    MSpec.clear_current
+  end
+
+  it "sets the value returned by MSpec.current" do
+    MSpec.current.should be_nil
+    MSpec.register_current :a
+    MSpec.current.should == :a
+  end
+end
+
+describe MSpec, ".clear_current" do
+  it "sets the value returned by MSpec.current to nil" do
+    MSpec.register_current :a
+    MSpec.current.should_not be_nil
+    MSpec.clear_current
+    MSpec.current.should be_nil
   end
 end
 
 describe MSpec, ".current" do
-  it "returns the top of the execution stack" do
-    MSpec.stack.clear
-    MSpec.stack.push :a
-    MSpec.stack.push :b
-    MSpec.current.should == :b
+  before :each do
+    MSpec.clear_current
+  end
+
+  it "returns nil if no ContextState has been registered" do
+    MSpec.current.should be_nil
+  end
+
+  it "returns the most recently registered ContextState" do
+    first = ContextState.new ""
+    second = ContextState.new ""
+    MSpec.register_current first
+    MSpec.current.should == first
+    MSpec.register_current second
+    MSpec.current.should == second
   end
 end
 
@@ -187,23 +222,32 @@ end
 
 describe MSpec, ".describe" do
   before :each do
-    MSpec.stack.clear
+    MSpec.clear_current
+    @cs = ContextState.new ""
+    ContextState.stub!(:new).and_return(@cs)
+    MSpec.stub!(:current).and_return(nil)
+    MSpec.stub!(:register_current)
   end
 
-  it "accepts one argument" do
-    MSpec.describe(Object) { ScratchPad.record MSpec.current }
-    ScratchPad.recorded.should be_kind_of(ContextState)
+  it "creates a new ContextState for the block" do
+    ContextState.should_receive(:new).and_return(@cs)
+    MSpec.describe(Object) { }
   end
 
-  it "pushes a new ContextState instance on the stack" do
-    MSpec.describe(Object, "msg") { ScratchPad.record MSpec.current }
-    ScratchPad.recorded.should be_kind_of(ContextState)
+  it "accepts an optional second argument" do
+    ContextState.should_receive(:new).and_return(@cs)
+    MSpec.describe(Object, "msg") { }
   end
 
-  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(ContextState)
-    MSpec.stack.should == []
+  it "registers the newly created ContextState" do
+    MSpec.should_receive(:register_current).with(@cs).twice
+    MSpec.describe(Object) { }
+  end
+
+  it "invokes the ContextState#describe method" do
+    prc = lambda { }
+    @cs.should_receive(:describe).with(&prc)
+    MSpec.describe(Object, "msg", &prc)
   end
 end
 
@@ -419,3 +463,23 @@ describe MSpec, ".clear_expectations" do
     MSpec.expectation?.should be_false
   end
 end
+
+describe MSpec, ".register_shared" do
+  it "stores a shared ContextState by description" do
+    parent = ContextState.new "container"
+    state = ContextState.new "shared"
+    state.parent = parent
+    prc = lambda { }
+    state.describe(&prc)
+    MSpec.register_shared(state)
+    MSpec.retrieve(:shared)["shared"].should == state
+  end
+end
+
+describe MSpec, ".retrieve_shared" do
+  it "retrieves the shared ContextState matching description" do
+    state = ContextState.new ""
+    MSpec.retrieve(:shared)["shared"] = state
+    MSpec.retrieve_shared(:shared).should == state
+  end
+end