mspec 1.5.10 → 1.5.11

data/spec/runner/formatters/html_spec.rb

@@ -104,11 +104,11 @@ describe HtmlFormatter, "#exception" do
   end
 
   it "prints the #it string once for each exception raised" do
-    exc = ExceptionState.new @state, nil, ExpectationNotMetError.new("disappointing")
+    exc = ExceptionState.new @state, nil, SpecExpectationNotMetError.new("disappointing")
     @formatter.exception exc
     exc = ExceptionState.new @state, nil, MSpecExampleError.new("painful")
     @formatter.exception exc
-    @out.should == 
+    @out.should ==
 %[<li class="fail">- it (<a href="#details-1">FAILED - 1</a>)</li>
 <li class="fail">- it (<a href="#details-2">ERROR - 2</a>)</li>
 ]
@@ -133,7 +133,7 @@ describe HtmlFormatter, "#after" do
   end
 
   it "does not print any output if an exception is raised" do
-    exc = ExceptionState.new @state, nil, ExpectationNotMetError.new("disappointing")
+    exc = ExceptionState.new @state, nil, SpecExpectationNotMetError.new("disappointing")
     @formatter.exception exc
     out = @out.dup
     @formatter.after @state

data/spec/runner/formatters/method_spec.rb

@@ -118,7 +118,7 @@ describe MethodFormatter, "#after" do
     state = ExampleState.new ContextState.new("Some#method"), "it"
     @formatter.before state
 
-    exc = ExpectationNotMetError.new "failed"
+    exc = SpecExpectationNotMetError.new "failed"
     @formatter.exception ExceptionState.new(@state, nil, exc)
     @formatter.exception ExceptionState.new(@state, nil, exc)
 
@@ -152,7 +152,7 @@ describe MethodFormatter, "#after" do
     @formatter.tally.counter.failures = 2
     @formatter.tally.counter.errors = 1
 
-    exc = ExpectationNotMetError.new "failed"
+    exc = SpecExpectationNotMetError.new "failed"
     @formatter.exception ExceptionState.new(@state, nil, exc)
     @formatter.exception ExceptionState.new(@state, nil, exc)
 

data/spec/runner/formatters/specdoc_spec.rb

@@ -47,7 +47,7 @@ describe SpecdocFormatter, "#before" do
   end
 
   it "resets the #exception? flag" do
-    exc = ExceptionState.new @state, nil, ExpectationNotMetError.new("disappointing")
+    exc = ExceptionState.new @state, nil, SpecExpectationNotMetError.new("disappointing")
     @formatter.exception exc
     @formatter.exception?.should be_true
     @formatter.before @state
@@ -67,20 +67,20 @@ describe SpecdocFormatter, "#exception" do
     $stdout = STDOUT
   end
 
-  it "prints 'ERROR' if an exception is not an ExpectationNotMetError" do
+  it "prints 'ERROR' if an exception is not an SpecExpectationNotMetError" 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")
+  it "prints 'FAILED' if an exception is an SpecExpectationNotMetError" do
+    exc = ExceptionState.new @state, nil, SpecExpectationNotMetError.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")
+    exc = ExceptionState.new @state, nil, SpecExpectationNotMetError.new("disappointing")
     @formatter.exception exc
     exc = ExceptionState.new @state, nil, MSpecExampleError.new("painful")
     @formatter.exception exc

data/spec/runner/formatters/summary_spec.rb

@@ -16,7 +16,7 @@ describe SummaryFormatter, "#after" do
   end
 
   it "does not print anything" do
-    exc = ExceptionState.new @state, nil, ExpectationNotMetError.new("disappointing")
+    exc = ExceptionState.new @state, nil, SpecExpectationNotMetError.new("disappointing")
     @formatter.exception exc
     exc = ExceptionState.new @state, nil, MSpecExampleError.new("painful")
     @formatter.exception exc

data/spec/utils/options_spec.rb

@@ -236,48 +236,49 @@ end
 describe MSpecOptions, "#parse" do
   before :each do
     @opt = MSpecOptions.new
-    @prc = lambda { |o| ScratchPad.record [:parsed, o] }
+    @prc = lambda { ScratchPad.record :parsed }
+    @arg_prc = lambda { |o| ScratchPad.record [:parsed, o] }
     ScratchPad.clear
   end
 
   it "parses a short option" do
     @opt.on "-a", "desc", &@prc
     @opt.parse ["-a"]
-    ScratchPad.recorded.should == [:parsed, nil]
+    ScratchPad.recorded.should == :parsed
   end
 
   it "parse a long option" do
     @opt.on "--abdc", "desc", &@prc
     @opt.parse ["--abdc"]
-    ScratchPad.recorded.should == [:parsed, nil]
+    ScratchPad.recorded.should == :parsed
   end
 
   it "parses a short option group" do
-    @opt.on "-a", "ARG", "desc", &@prc
+    @opt.on "-a", "ARG", "desc", &@arg_prc
     @opt.parse ["-a", "ARG"]
     ScratchPad.recorded.should == [:parsed, "ARG"]
   end
 
   it "parses a short option with an argument" do
-    @opt.on "-a", "ARG", "desc", &@prc
+    @opt.on "-a", "ARG", "desc", &@arg_prc
     @opt.parse ["-a", "ARG"]
     ScratchPad.recorded.should == [:parsed, "ARG"]
   end
 
   it "parses a short option with connected argument" do
-    @opt.on "-a", "ARG", "desc", &@prc
+    @opt.on "-a", "ARG", "desc", &@arg_prc
     @opt.parse ["-aARG"]
     ScratchPad.recorded.should == [:parsed, "ARG"]
   end
 
   it "parses a long option with an argument" do
-    @opt.on "--abdc", "ARG", "desc", &@prc
+    @opt.on "--abdc", "ARG", "desc", &@arg_prc
     @opt.parse ["--abdc", "ARG"]
     ScratchPad.recorded.should == [:parsed, "ARG"]
   end
 
   it "parses a long option with an '=' argument" do
-    @opt.on "--abdc", "ARG", "desc", &@prc
+    @opt.on "--abdc", "ARG", "desc", &@arg_prc
     @opt.parse ["--abdc=ARG"]
     ScratchPad.recorded.should == [:parsed, "ARG"]
   end
@@ -300,7 +301,7 @@ describe MSpecOptions, "#parse" do
   end
 
   it "returns the unprocessed entries" do
-    @opt.on "-a", "ARG", "desc", &@prc
+    @opt.on "-a", "ARG", "desc", &@arg_prc
     @opt.parse(["abdc", "-a", "ilny"]).should == ["abdc"]
   end
 

data/spec/utils/script_spec.rb

@@ -356,13 +356,14 @@ describe MSpecScript, "#entries" do
   end
 
   it "returns the pattern in an array if it is a file" do
-    File.should_receive(:expand_path).with("file").and_return("file")
-    File.should_receive(:file?).with("file").and_return(true)
-    @script.entries("file").should == ["file"]
+    File.should_receive(:expand_path).with("file").and_return("file/expanded")
+    File.should_receive(:file?).with("file/expanded").and_return(true)
+    @script.entries("file").should == ["file/expanded"]
   end
 
   it "returns Dir['pattern/**/*_spec.rb'] if pattern is a directory" do
     File.should_receive(:directory?).with("name").and_return(true)
+    File.stub!(:expand_path).and_return("name","name/**/*_spec.rb")
     Dir.should_receive(:[]).with("name/**/*_spec.rb").and_return(["dir1", "dir2"])
     @script.entries("name").should == ["dir1", "dir2"]
   end
@@ -386,7 +387,7 @@ describe MSpecScript, "#entries" do
     end
 
     it "returns Dir['pattern/**/*_spec.rb'] if pattern is a directory" do
-      File.should_receive(:expand_path).with(@name).and_return(@name)
+      File.stub!(:expand_path).and_return(@name, @name+"/**/*_spec.rb")
       File.should_receive(:directory?).with(@name).and_return(true)
       Dir.should_receive(:[]).with(@name + "/**/*_spec.rb").and_return(["dir1", "dir2"])
       @script.entries("name").should == ["dir1", "dir2"]
@@ -433,10 +434,10 @@ describe MSpecScript, "#files" do
 
   it "looks up items with leading ':' in the config object" do
     @script.should_receive(:entries).and_return(["file1"], ["file2"])
-    @script.files(":files").should == ["file1", "file2"]
+    @script.files([":files"]).should == ["file1", "file2"]
   end
 
   it "returns an empty list if the config key is not set" do
-    @script.files(":all_files").should == []
+    @script.files([":all_files"]).should == []
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors: 
 - Brian Ford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-01 00:00:00 -08:00
+date: 2009-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -64,6 +64,7 @@ files:
 - lib/mspec/helpers/tmp.rb
 - lib/mspec/helpers.rb
 - lib/mspec/matchers/base.rb
+- lib/mspec/matchers/be_an_instance_of.rb
 - lib/mspec/matchers/be_ancestor_of.rb
 - lib/mspec/matchers/be_close.rb
 - lib/mspec/matchers/be_empty.rb
@@ -147,6 +148,7 @@ files:
 - spec/commands/mspec_spec.rb
 - spec/commands/mspec_tag_spec.rb
 - spec/expectations/expectations_spec.rb
+- spec/expectations/should.rb
 - spec/expectations/should_spec.rb
 - spec/guards/background_spec.rb
 - spec/guards/bug_spec.rb
@@ -175,6 +177,7 @@ files:
 - spec/helpers/scratch_spec.rb
 - spec/helpers/tmp_spec.rb
 - spec/matchers/base_spec.rb
+- spec/matchers/be_an_instance_of_spec.rb
 - spec/matchers/be_ancestor_of_spec.rb
 - spec/matchers/be_close_spec.rb
 - spec/matchers/be_empty_spec.rb