mspec 1.5.9 → 1.5.10

data/spec/guards/noncompliance_spec.rb

@@ -47,3 +47,23 @@ describe Object, "#deviates_on" do
     ScratchPad.recorded.should == :yield
   end
 end
+
+describe Object, "#deviates_on" do
+  before :each do
+    @guard = NonComplianceGuard.new
+    NonComplianceGuard.stub!(:new).and_return(@guard)
+  end
+
+  it "sets the name of the guard to :deviates_on" do
+    deviates_on(:jruby) { }
+    @guard.name.should == :deviates_on
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      deviates_on(:rubinius) { raise Exception }
+    end.should raise_error(Exception)
+  end
+end

data/spec/guards/platform_spec.rb

@@ -19,6 +19,19 @@ describe Object, "#platform_is" do
     platform_is(:solarce) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
+
+  it "sets the name of the guard to :platform_is" do
+    platform_is(:solarce) { }
+    @guard.name.should == :platform_is
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      platform_is(:solarce) { raise Exception }
+    end.should raise_error(Exception)
+  end
 end
 
 describe Object, "#platform_is_not" do
@@ -39,6 +52,19 @@ describe Object, "#platform_is_not" do
     platform_is_not(:solarce) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
+
+  it "sets the name of the guard to :platform_is_not" do
+    platform_is_not(:solarce) { }
+    @guard.name.should == :platform_is_not
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(false)
+    @guard.should_receive(:unregister)
+    lambda do
+      platform_is_not(:solarce) { raise Exception }
+    end.should raise_error(Exception)
+  end
 end
 
 describe Object, "#platform_is :wordsize => SIZE_SPEC" do

data/spec/guards/quarantine_spec.rb

@@ -10,10 +10,26 @@ end
 describe Object, "#quarantine!" do
   before :each do
     ScratchPad.clear
+
+    @guard = QuarantineGuard.new
+    QuarantineGuard.stub!(:new).and_return(@guard)
   end
 
   it "does not yield" do
     quarantine! { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
+
+  it "sets the name of the guard to :quarantine!" do
+    quarantine! { }
+    @guard.name.should == :quarantine!
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      quarantine! { raise Exception }
+    end.should raise_error(Exception)
+  end
 end

data/spec/guards/runner_spec.rb

@@ -52,6 +52,19 @@ describe Object, "#runner_is" do
     runner_is(:mspec) { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
+
+  it "sets the name of the guard to :runner_is" do
+    runner_is(:mspec) { }
+    @guard.name.should == :runner_is
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      runner_is(:mspec) { raise Exception }
+    end.should raise_error(Exception)
+  end
 end
 
 describe Object, "#runner_is_not" do
@@ -72,4 +85,17 @@ describe Object, "#runner_is_not" do
     runner_is_not(:mspec) { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
+
+  it "sets the name of the guard to :runner_is_not" do
+    runner_is_not(:mspec) { }
+    @guard.name.should == :runner_is_not
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(false)
+    @guard.should_receive(:unregister)
+    lambda do
+      runner_is_not(:mspec) { raise Exception }
+    end.should raise_error(Exception)
+  end
 end

data/spec/guards/superuser_spec.rb

@@ -19,4 +19,17 @@ describe Object, "#as_superuser" do
     as_superuser { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
+
+  it "sets the name of the guard to :as_superuser" do
+    as_superuser { }
+    @guard.name.should == :as_superuser
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      as_superuser { raise Exception }
+    end.should raise_error(Exception)
+  end
 end

data/spec/guards/support_spec.rb

@@ -47,3 +47,23 @@ describe Object, "#not_supported_on" do
     ScratchPad.recorded.should == :yield
   end
 end
+
+describe Object, "#not_supported_on" do
+  before :each do
+    @guard = SupportedGuard.new
+    SupportedGuard.stub!(:new).and_return(@guard)
+  end
+
+  it "sets the name of the guard to :not_supported_on" do
+    not_supported_on(:rubinius) { }
+    @guard.name.should == :not_supported_on
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      not_supported_on(:rubinius) { raise Exception }
+    end.should raise_error(Exception)
+  end
+end

data/spec/guards/tty_spec.rb

@@ -4,6 +4,9 @@ require 'mspec/guards/tty'
 describe Object, "#with_tty" do
   before :each do
     ScratchPad.clear
+
+    @guard = TTYGuard.new
+    TTYGuard.stub!(:new).and_return(@guard)
   end
 
   it "yields if STDOUT is a TTY" do
@@ -17,4 +20,17 @@ describe Object, "#with_tty" do
     with_tty { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
+
+  it "sets the name of the guard to :with_tty" do
+    with_tty { }
+    @guard.name.should == :with_tty
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      with_tty { raise Exception }
+    end.should raise_error(Exception)
+  end
 end

data/spec/guards/version_spec.rb

@@ -114,4 +114,17 @@ describe Object, "#ruby_version_is" do
     ruby_version_is('x.x.x.x') { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end
+
+  it "sets the name of the guard to :ruby_version_is" do
+    ruby_version_is("") { }
+    @guard.name.should == :ruby_version_is
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(true)
+    @guard.should_receive(:unregister)
+    lambda do
+      ruby_version_is("") { raise Exception }
+    end.should raise_error(Exception)
+  end
 end

data/spec/matchers/have_constant_spec.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/have_constant'
+
+class HCMSpecs
+  X = :x
+end
+
+describe HaveConstantMatcher do
+  it "matches when mod has the constant" do
+    matcher = HaveConstantMatcher.new :X
+    matcher.matches?(HCMSpecs).should be_true
+  end
+
+  it "does not match when mod does not have the constant" do
+    matcher = HaveConstantMatcher.new :A
+    matcher.matches?(HCMSpecs).should be_false
+  end
+
+  it "provides a failure message for #should" do
+    matcher = HaveConstantMatcher.new :A
+    matcher.matches?(HCMSpecs)
+    matcher.failure_message.should == [
+      "Expected HCMSpecs to have constant 'A'",
+      "but it does not"
+    ]
+  end
+
+  it "provides a failure messoge for #should_not" do
+    matcher = HaveConstantMatcher.new :X
+    matcher.matches?(HCMSpecs)
+    matcher.negative_failure_message.should == [
+      "Expected HCMSpecs NOT to have constant 'X'",
+      "but it does"
+    ]
+  end
+end

data/spec/matchers/stringsymboladapter_spec.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/stringsymboladapter'
+
+class StringSymbolSpecs
+  include StringSymbolAdapter
+end
+
+describe StringSymbolAdapter, "#convert_name" do
+  before :all do
+    @verbose = $VERBOSE
+    $VERBOSE = nil
+  end
+
+  after :all do
+    $VERBOSE = @verbose
+  end
+
+  before :each do
+    @ruby_version = Object.const_get :RUBY_VERSION
+
+    @name = mock("name")
+  end
+
+  after :each do
+    Object.const_set :RUBY_VERSION, @ruby_version
+  end
+
+  it "converts the name to a string if RUBY_VERSION < 1.9" do
+    Object.const_set :RUBY_VERSION, "1.8.6"
+    @name.should_receive(:to_s).and_return("method_name")
+    StringSymbolSpecs.new.convert_name @name
+  end
+
+  it "does not convert the name to a string if RUBY_VERSION >= 1.9" do
+    Object.const_set :RUBY_VERSION, "1.9.0"
+    @name.should_not_receive(:to_s)
+    StringSymbolSpecs.new.convert_name @name
+  end
+end

data/spec/runner/actions/tagpurge_spec.rb

@@ -81,6 +81,7 @@ describe TagPurgeAction, "#unload" do
 
   it "does not rewrite any tags if there were no tags for the specs" do
     MSpec.should_receive(:read_tags).and_return([])
+    MSpec.should_receive(:delete_tags)
     MSpec.should_not_receive(:write_tags)
 
     @action.load

data/spec/runner/actions/tally_spec.rb

@@ -69,6 +69,19 @@ describe Tally, "#errors!" do
   end
 end
 
+describe Tally, "#guards!" do
+  before :each do
+    @tally = Tally.new
+  end
+
+  it "increments the count returned by #guards" do
+    @tally.guards!
+    @tally.guards.should == 1
+    @tally.guards! 2
+    @tally.guards.should == 3
+  end
+end
+
 describe Tally, "#file" do
   before :each do
     @tally = Tally.new
@@ -139,11 +152,29 @@ describe Tally, "#error" do
   end
 end
 
+describe Tally, "#guard" do
+  before :each do
+    @tally = Tally.new
+  end
+
+  it "returns a formatted string of the number of #guards" do
+    @tally.guard.should == "0 guards"
+    @tally.guards!
+    @tally.guard.should == "1 guard"
+    @tally.guards!
+    @tally.guard.should == "2 guards"
+  end
+end
+
 describe Tally, "#format" do
   before :each do
     @tally = Tally.new
   end
 
+  after :each do
+    MSpec.clear_modes
+  end
+
   it "returns a formatted string of counts" do
     @tally.files!
     @tally.examples! 2
@@ -151,6 +182,39 @@ describe Tally, "#format" do
     @tally.errors!
     @tally.format.should == "1 file, 2 examples, 4 expectations, 0 failures, 1 error"
   end
+
+  it "includes guards if MSpec is in verify mode" do
+    MSpec.register_mode :verify
+    @tally.files!
+    @tally.examples! 2
+    @tally.expectations! 4
+    @tally.errors!
+    @tally.guards!
+    @tally.format.should ==
+      "1 file, 2 examples, 4 expectations, 0 failures, 1 error, 1 guard"
+  end
+
+  it "includes guards if MSpec is in report mode" do
+    MSpec.register_mode :report
+    @tally.files!
+    @tally.examples! 2
+    @tally.expectations! 4
+    @tally.errors!
+    @tally.guards! 2
+    @tally.format.should ==
+      "1 file, 2 examples, 4 expectations, 0 failures, 1 error, 2 guards"
+  end
+
+  it "includes guards if MSpec is in report_on mode" do
+    MSpec.register_mode :report_on
+    @tally.files!
+    @tally.examples! 2
+    @tally.expectations! 4
+    @tally.errors!
+    @tally.guards! 2
+    @tally.format.should ==
+      "1 file, 2 examples, 4 expectations, 0 failures, 1 error, 2 guards"
+  end
 end
 
 describe TallyAction, "#counter" do

data/spec/runner/context_spec.rb

@@ -91,14 +91,27 @@ describe ContextState, "#it" do
   before :each do
     @state = ContextState.new ""
     @proc = lambda { }
+
+    @ex = ExampleState.new("", "", &@proc)
   end
 
   it "creates an ExampleState instance for the block" do
-    ex = ExampleState.new("", "", &@proc)
-    ExampleState.should_receive(:new).with(@state, "it", @proc).and_return(ex)
+    ExampleState.should_receive(:new).with(@state, "it", @proc).and_return(@ex)
     @state.describe(&@proc)
     @state.it("it", &@proc)
   end
+
+  it "calls registered :add actions" do
+    ExampleState.should_receive(:new).with(@state, "it", @proc).and_return(@ex)
+
+    add_action = mock("add")
+    add_action.should_receive(:add).with(@ex).and_return { ScratchPad.record :add }
+    MSpec.register :add, add_action
+
+    @state.it("it", &@proc)
+    ScratchPad.recorded.should == :add
+    MSpec.unregister :add, add_action
+  end
 end
 
 describe ContextState, "#examples" do
@@ -544,7 +557,7 @@ describe ContextState, "#process" do
     MSpec.store :example, nil
   end
 
-  it "calls registered example actions with the current ExampleState and block" do
+  it "calls registered :example actions with the current ExampleState and block" do
     @state.it("") { MSpec.expectation }
     @state.process
 
@@ -574,7 +587,7 @@ describe ContextState, "#process" do
     MSpec.store :after, nil
   end
 
-  it "calls registered before actions with the current ExampleState 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
@@ -586,7 +599,7 @@ describe ContextState, "#process" do
     @spec_state.should be_kind_of(ExampleState)
   end
 
-  it "calls registered after actions with the current ExampleState 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
@@ -614,7 +627,7 @@ describe ContextState, "#process" do
     MSpec.store :leave, nil
   end
 
-  it "calls registered enter actions with the current #describe string" do
+  it "calls registered :enter actions with the current #describe string" do
     enter = mock("enter")
     enter.should_receive(:enter).with("C#m").and_return { ScratchPad.record :enter }
     MSpec.register :enter, enter
@@ -622,7 +635,7 @@ describe ContextState, "#process" do
     ScratchPad.recorded.should == :enter
   end
 
-  it "calls registered leave actions" do
+  it "calls registered :leave actions" do
     leave = mock("leave")
     leave.should_receive(:leave).and_return { ScratchPad.record :leave }
     MSpec.register :leave, leave
@@ -755,7 +768,7 @@ describe ContextState, "#process in pretend mode" do
     MSpec.store :after, nil
   end
 
-  it "calls registered before actions with the current ExampleState 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
@@ -767,7 +780,7 @@ describe ContextState, "#process in pretend mode" do
     @spec_state.should be_kind_of(ExampleState)
   end
 
-  it "calls registered after actions with the current ExampleState 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
@@ -878,7 +891,7 @@ describe ContextState, "#process in pretend mode" do
     MSpec.store :leave, nil
   end
 
-  it "calls registered enter actions with the current #describe string" do
+  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
@@ -886,7 +899,7 @@ describe ContextState, "#process in pretend mode" do
     ScratchPad.recorded.should == :enter
   end
 
-  it "calls registered leave actions" do
+  it "calls registered :leave actions" do
     leave = mock("leave")
     leave.should_receive(:leave).and_return { ScratchPad.record :leave }
     MSpec.register :leave, leave