mspec 1.8.0 → 1.9.0

data/spec/runner/actions/taglist_spec.rb

@@ -6,7 +6,7 @@ require 'mspec/runner/tag'
 
 describe TagListAction, "#include?" do
   it "returns true" do
-    TagListAction.new.include?(:anything).should be_true
+    TagListAction.new.include?(:anything).should be_truthy
   end
 end
 
@@ -22,12 +22,12 @@ describe TagListAction, "#===" do
 
   it "returns true if filter === string returns true" do
     @filter.should_receive(:===).with("str").and_return(true)
-    @action.===("str").should be_true
+    @action.===("str").should be_truthy
   end
 
   it "returns false if filter === string returns false" do
     @filter.should_receive(:===).with("str").and_return(false)
-    @action.===("str").should be_false
+    @action.===("str").should be_falsey
   end
 end
 

data/spec/runner/actions/timer_spec.rb

@@ -19,17 +19,17 @@ describe TimerAction do
   end
 
   it "responds to #elapsed by returning the difference between stop and start" do
-    Time.stub(:now).and_return(Time.parse('Mon Mar 30 14:05:19 -0700 2009'))
+    @timer.stub(:current_time).and_return(Time.parse('Mon Mar 30 14:05:19 -0700 2009'))
     @timer.start
-    Time.stub(:now).and_return(Time.parse('Mon Mar 30 14:05:52 -0700 2009'))
+    @timer.stub(:current_time).and_return(Time.parse('Mon Mar 30 14:05:52 -0700 2009'))
     @timer.finish
     @timer.elapsed.should == 33
   end
 
   it "responds to #format by returning a readable string of elapsed time" do
-    Time.stub(:now).and_return(Time.parse('Mon Mar 30 14:05:19 -0700 2009'))
+    @timer.stub(:current_time).and_return(Time.parse('Mon Mar 30 14:05:19 -0700 2009'))
     @timer.start
-    Time.stub(:now).and_return(Time.parse('Mon Mar 30 14:05:52 -0700 2009'))
+    @timer.stub(:current_time).and_return(Time.parse('Mon Mar 30 14:05:52 -0700 2009'))
     @timer.finish
     @timer.format.should == "Finished in 33.000000 seconds"
   end

data/spec/runner/context_spec.rb

@@ -39,11 +39,11 @@ end
 
 describe ContextState, "#shared?" do
   it "returns false when the ContextState is not shared" do
-    ContextState.new("").shared?.should be_false
+    ContextState.new("").shared?.should be_falsey
   end
 
   it "returns true when the ContextState is shared" do
-    ContextState.new("", {:shared => true}).shared?.should be_true
+    ContextState.new("", {:shared => true}).shared?.should be_truthy
   end
 end
 
@@ -105,7 +105,7 @@ describe ContextState, "#it" do
     ExampleState.should_receive(:new).with(@state, "it", @proc).and_return(@ex)
 
     add_action = double("add")
-    add_action.should_receive(:add).with(@ex).and_return { ScratchPad.record :add }
+    add_action.should_receive(:add) { ScratchPad.record :add }.with(@ex)
     MSpec.register :add, add_action
 
     @state.it("it", &@proc)
@@ -224,7 +224,7 @@ describe ContextState, "#protect" do
 
   it "returns true and does execute any blocks if check and MSpec.mode?(:pretend) are true" do
     MSpec.should_receive(:mode?).with(:pretend).and_return(true)
-    ContextState.new("").protect("message", [@a, @b]).should be_true
+    ContextState.new("").protect("message", [@a, @b]).should be_truthy
     ScratchPad.recorded.should == []
   end
 
@@ -240,11 +240,11 @@ describe ContextState, "#protect" do
   end
 
   it "returns true if none of the blocks raise an exception" do
-    ContextState.new("").protect("message", [@a, @b]).should be_true
+    ContextState.new("").protect("message", [@a, @b]).should be_truthy
   end
 
   it "returns false if any of the blocks raise an exception" do
-    ContextState.new("").protect("message", [@a, @c, @b]).should be_false
+    ContextState.new("").protect("message", [@a, @c, @b]).should be_falsey
   end
 end
 
@@ -460,7 +460,7 @@ describe ContextState, "#process" do
     MSpec.should_receive(:clear_expectations)
     @state.it("it") { ScratchPad.record MSpec.expectation? }
     @state.process
-    ScratchPad.recorded.should be_false
+    ScratchPad.recorded.should be_falsey
   end
 
   it "shuffles the spec list if MSpec.randomize? is true" do
@@ -595,7 +595,7 @@ describe ContextState, "#process" do
 
   it "calls registered :before actions with the current ExampleState instance" do
     before = double("before")
-    before.should_receive(:before).and_return {
+    before.should_receive(:before) {
       ScratchPad.record :before
       @spec_state = @state.state
     }
@@ -607,7 +607,7 @@ describe ContextState, "#process" do
 
   it "calls registered :after actions with the current ExampleState instance" do
     after = double("after")
-    after.should_receive(:after).and_return {
+    after.should_receive(:after) {
       ScratchPad.record :after
       @spec_state = @state.state
     }
@@ -635,7 +635,7 @@ describe ContextState, "#process" do
 
   it "calls registered :enter actions with the current #describe string" do
     enter = double("enter")
-    enter.should_receive(:enter).with("C#m").and_return { ScratchPad.record :enter }
+    enter.should_receive(:enter) { ScratchPad.record :enter }.with("C#m")
     MSpec.register :enter, enter
     @state.process
     ScratchPad.recorded.should == :enter
@@ -643,7 +643,7 @@ describe ContextState, "#process" do
 
   it "calls registered :leave actions" do
     leave = double("leave")
-    leave.should_receive(:leave).and_return { ScratchPad.record :leave }
+    leave.should_receive(:leave) { ScratchPad.record :leave }
     MSpec.register :leave, leave
     @state.process
     ScratchPad.recorded.should == :leave
@@ -776,7 +776,7 @@ describe ContextState, "#process in pretend mode" do
 
   it "calls registered :before actions with the current ExampleState instance" do
     before = double("before")
-    before.should_receive(:before).and_return {
+    before.should_receive(:before) {
       ScratchPad.record :before
       @spec_state = @state.state
     }
@@ -788,7 +788,7 @@ describe ContextState, "#process in pretend mode" do
 
   it "calls registered :after actions with the current ExampleState instance" do
     after = double("after")
-    after.should_receive(:after).and_return {
+    after.should_receive(:after) {
       ScratchPad.record :after
       @spec_state = @state.state
     }
@@ -899,7 +899,7 @@ describe ContextState, "#process in pretend mode" do
 
   it "calls registered :enter actions with the current #describe string" do
     enter = double("enter")
-    enter.should_receive(:enter).and_return { ScratchPad.record :enter }
+    enter.should_receive(:enter) { ScratchPad.record :enter }
     MSpec.register :enter, enter
     @state.process
     ScratchPad.recorded.should == :enter
@@ -907,7 +907,7 @@ describe ContextState, "#process in pretend mode" do
 
   it "calls registered :leave actions" do
     leave = double("leave")
-    leave.should_receive(:leave).and_return { ScratchPad.record :leave }
+    leave.should_receive(:leave) { ScratchPad.record :leave }
     MSpec.register :leave, leave
     @state.process
     ScratchPad.recorded.should == :leave
@@ -1030,12 +1030,12 @@ describe ContextState, "#filter_examples" do
 
   it "returns true if there are remaining examples to evaluate" do
     @state.examples.first.stub(:filtered?).and_return(true)
-    @state.filter_examples.should be_true
+    @state.filter_examples.should be_truthy
   end
 
   it "returns false if there are no remaining examples to evaluate" do
     @state.examples.first.stub(:filtered?).and_return(true)
     @state.examples.last.stub(:filtered?).and_return(true)
-    @state.filter_examples.should be_false
+    @state.filter_examples.should be_falsey
   end
 end

data/spec/runner/exception_spec.rb

@@ -72,17 +72,17 @@ describe ExceptionState, "#failure?" do
 
   it "returns true if the exception is an SpecExpectationNotMetError" do
     exc = ExceptionState.new @state, "", SpecExpectationNotMetError.new("Fail!")
-    exc.failure?.should be_true
+    exc.failure?.should be_truthy
   end
 
   it "returns true if the exception is an SpecExpectationNotFoundError" do
     exc = ExceptionState.new @state, "", SpecExpectationNotFoundError.new("Fail!")
-    exc.failure?.should be_true
+    exc.failure?.should be_truthy
   end
 
   it "returns false if the exception is not an SpecExpectationNotMetError or an SpecExpectationNotFoundError" do
     exc = ExceptionState.new @state, "", Exception.new("Fail!")
-    exc.failure?.should be_false
+    exc.failure?.should be_falsey
   end
 end
 

data/spec/runner/formatters/dotted_spec.rb

@@ -85,16 +85,16 @@ describe DottedFormatter, "#exception" do
 
   it "sets the #failure? flag" do
     @formatter.exception @failure
-    @formatter.failure?.should be_true
+    @formatter.failure?.should be_truthy
     @formatter.exception @error
-    @formatter.failure?.should be_false
+    @formatter.failure?.should be_falsey
   end
 
   it "sets the #exception? flag" do
     @formatter.exception @error
-    @formatter.exception?.should be_true
+    @formatter.exception?.should be_truthy
     @formatter.exception @failure
-    @formatter.exception?.should be_true
+    @formatter.exception?.should be_truthy
   end
 
   it "addes the exception to the list of exceptions" do
@@ -113,25 +113,25 @@ describe DottedFormatter, "#exception?" do
   end
 
   it "returns false if there have been no exceptions" do
-    @formatter.exception?.should be_false
+    @formatter.exception?.should be_falsey
   end
 
   it "returns true if any exceptions are errors" do
     @formatter.exception @failure
     @formatter.exception @error
-    @formatter.exception?.should be_true
+    @formatter.exception?.should be_truthy
   end
 
   it "returns true if all exceptions are failures" do
     @formatter.exception @failure
     @formatter.exception @failure
-    @formatter.exception?.should be_true
+    @formatter.exception?.should be_truthy
   end
 
   it "returns true if all exceptions are errors" do
     @formatter.exception @error
     @formatter.exception @error
-    @formatter.exception?.should be_true
+    @formatter.exception?.should be_truthy
   end
 end
 
@@ -143,19 +143,19 @@ describe DottedFormatter, "#failure?" do
   end
 
   it "returns false if there have been no exceptions" do
-    @formatter.failure?.should be_false
+    @formatter.failure?.should be_falsey
   end
 
   it "returns false if any exceptions are errors" do
     @formatter.exception @failure
     @formatter.exception @error
-    @formatter.failure?.should be_false
+    @formatter.failure?.should be_falsey
   end
 
   it "returns true if all exceptions are failures" do
     @formatter.exception @failure
     @formatter.exception @failure
-    @formatter.failure?.should be_true
+    @formatter.failure?.should be_truthy
   end
 end
 
@@ -167,15 +167,15 @@ describe DottedFormatter, "#before" do
   end
 
   it "resets the #failure? flag to false" do
-    @formatter.failure?.should be_true
+    @formatter.failure?.should be_truthy
     @formatter.before @state
-    @formatter.failure?.should be_false
+    @formatter.failure?.should be_falsey
   end
 
   it "resets the #exception? flag to false" do
-    @formatter.exception?.should be_true
+    @formatter.exception?.should be_truthy
     @formatter.before @state
-    @formatter.exception?.should be_false
+    @formatter.exception?.should be_falsey
   end
 end
 

data/spec/runner/formatters/file_spec.rb

@@ -31,15 +31,15 @@ describe FileFormatter, "#load" do
   end
 
   it "resets the #failure? flag to false" do
-    @formatter.failure?.should be_true
+    @formatter.failure?.should be_truthy
     @formatter.load @state
-    @formatter.failure?.should be_false
+    @formatter.failure?.should be_falsey
   end
 
   it "resets the #exception? flag to false" do
-    @formatter.exception?.should be_true
+    @formatter.exception?.should be_truthy
     @formatter.load @state
-    @formatter.exception?.should be_false
+    @formatter.exception?.should be_falsey
   end
 end
 

data/spec/runner/formatters/specdoc_spec.rb

@@ -49,9 +49,9 @@ describe SpecdocFormatter, "#before" do
   it "resets the #exception? flag" do
     exc = ExceptionState.new @state, nil, SpecExpectationNotMetError.new("disappointing")
     @formatter.exception exc
-    @formatter.exception?.should be_true
+    @formatter.exception?.should be_truthy
     @formatter.before @state
-    @formatter.exception?.should be_false
+    @formatter.exception?.should be_falsey
   end
 end
 

data/spec/runner/mspec_spec.rb

@@ -103,11 +103,11 @@ describe MSpec, ".protect" do
   end
 
   it "returns true if no exception is raised" do
-    MSpec.protect("passed") { 1 }.should be_true
+    MSpec.protect("passed") { 1 }.should be_truthy
   end
 
   it "returns false if an exception is raised" do
-    MSpec.protect("testing") { raise ScratchPad.recorded }.should be_false
+    MSpec.protect("testing") { raise ScratchPad.recorded }.should be_falsey
   end
 
   it "rescues any exceptions raised when evaluating the block argument" do
@@ -184,9 +184,9 @@ describe MSpec, ".actions" do
     MSpec.store :start, []
     ScratchPad.record []
     start_one = double("one")
-    start_one.stub(:start).and_return { ScratchPad << :one }
+    start_one.stub(:start) { ScratchPad << :one }
     start_two = double("two")
-    start_two.stub(:start).and_return { ScratchPad << :two }
+    start_two.stub(:start) { ScratchPad << :two }
     MSpec.register :start, start_one
     MSpec.register :start, start_two
   end
@@ -286,7 +286,11 @@ describe MSpec, ".describe" do
 
   it "invokes the ContextState#describe method" do
     prc = lambda { }
-    @cs.should_receive(:describe).with(&prc)
+
+    @cs.should_receive(:describe) do |&block|
+      block.should == prc
+    end
+
     MSpec.describe(Object, "msg", &prc)
   end
 end
@@ -300,7 +304,7 @@ describe MSpec, ".process" do
 
   it "calls all start actions" do
     start = double("start")
-    start.stub(:start).and_return { ScratchPad.record :start }
+    start.stub(:start) { ScratchPad.record :start }
     MSpec.register :start, start
     MSpec.process
     ScratchPad.recorded.should == :start
@@ -308,7 +312,7 @@ describe MSpec, ".process" do
 
   it "calls all finish actions" do
     finish = double("finish")
-    finish.stub(:finish).and_return { ScratchPad.record :finish }
+    finish.stub(:finish) { ScratchPad.record :finish }
     MSpec.register :finish, finish
     MSpec.process
     ScratchPad.recorded.should == :finish
@@ -330,7 +334,7 @@ describe MSpec, ".files" do
 
   it "calls load actions before each file" do
     load = double("load")
-    load.stub(:load).and_return { ScratchPad.record :load }
+    load.stub(:load) { ScratchPad.record :load }
     MSpec.register :load, load
     MSpec.files
     ScratchPad.recorded.should == :load
@@ -535,37 +539,37 @@ describe MSpec, ".delete_tags" do
 
   it "deletes the tag file" do
     MSpec.delete_tags
-    File.exist?(@tags).should be_false
+    File.exist?(@tags).should be_falsey
   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?.should be_falsey
     MSpec.expectation
-    MSpec.expectation?.should be_true
+    MSpec.expectation?.should be_truthy
   end
 end
 
 describe MSpec, ".expectation?" do
   it "returns true if an expectation has been reported" do
     MSpec.expectation
-    MSpec.expectation?.should be_true
+    MSpec.expectation?.should be_truthy
   end
 
   it "returns false if an expectation has not been reported" do
     MSpec.clear_expectations
-    MSpec.expectation?.should be_false
+    MSpec.expectation?.should be_falsey
   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.expectation?.should be_truthy
     MSpec.clear_expectations
-    MSpec.expectation?.should be_false
+    MSpec.expectation?.should be_falsey
   end
 end
 

data/spec/utils/options_spec.rb

@@ -33,11 +33,11 @@ end
 
 describe MSpecOption, "#arg?" do
   it "returns true if arg attribute is not nil" do
-    MSpecOption.new(nil, nil, "ARG", nil, nil).arg?.should be_true
+    MSpecOption.new(nil, nil, "ARG", nil, nil).arg?.should be_truthy
   end
 
   it "returns false if arg attribute is nil" do
-    MSpecOption.new(nil, nil, nil, nil, nil).arg?.should be_false
+    MSpecOption.new(nil, nil, nil, nil, nil).arg?.should be_falsey
   end
 end
 
@@ -47,16 +47,16 @@ describe MSpecOption, "#match?" do
   end
 
   it "returns true if the argument matches the short option" do
-    @opt.match?("-a").should be_true
+    @opt.match?("-a").should be_truthy
   end
 
   it "returns true if the argument matches the long option" do
-    @opt.match?("--bdc").should be_true
+    @opt.match?("--bdc").should be_truthy
   end
 
   it "returns false if the argument matches neither the short nor long option" do
-    @opt.match?("-b").should be_false
-    @opt.match?("-abdc").should be_false
+    @opt.match?("-b").should be_falsey
+    @opt.match?("-abdc").should be_falsey
   end
 end
 
@@ -1227,11 +1227,9 @@ describe "The -O, --report option" do
 end
 
 describe "The --report-on GUARD option" do
-  before :all do
+  before :each do
     MSpec.stub(:register_mode)
-  end
 
-  before :each do
     @options, @config = new_option
     @options.verify
 
@@ -1327,9 +1325,9 @@ describe "The -d, --debug option" do
 
   it "sets $MSPEC_DEBUG to true" do
     ["-d", "--debug"].each do |opt|
-      $MSPEC_DEBUG.should_not be_true
+      $MSPEC_DEBUG.should_not be_truthy
       @options.parse opt
-      $MSPEC_DEBUG.should be_true
+      $MSPEC_DEBUG.should be_truthy
       $MSPEC_DEBUG = nil
     end
   end