dchelimsky-rspec 1.1.11.1 → 1.1.11.2

data/spec/spec/example/pending_module_spec.rb

@@ -4,14 +4,12 @@ module Spec
       
       it 'should raise an ExamplePendingError if no block is supplied' do
         lambda {
-          include Pending
           pending "TODO"
         }.should raise_error(ExamplePendingError, /TODO/)
       end
       
       it 'should raise an ExamplePendingError if a supplied block fails as expected' do
         lambda {
-          include Pending
           pending "TODO" do
             raise "oops"
           end
@@ -20,7 +18,6 @@ module Spec
       
       it 'should raise an ExamplePendingError if a supplied block fails as expected with a mock' do
         lambda {
-          include Pending
           pending "TODO" do
             m = mock('thing')
             m.should_receive(:foo)
@@ -31,7 +28,6 @@ module Spec
       
       it 'should raise a PendingExampleFixedError if a supplied block starts working' do
         lambda {
-          include Pending
           pending "TODO" do
             # success!
           end
@@ -40,9 +36,8 @@ module Spec
       
       it "should have the correct file and line number for pending given with a block which fails" do
         file = __FILE__
-        line_number = __LINE__ + 3
+        line_number = __LINE__ + 2
         begin
-          include Pending
           pending do
             raise
           end
@@ -53,9 +48,8 @@ module Spec
       
       it "should have the correct file and line number for pending given with no block" do
         file = __FILE__
-        line_number = __LINE__ + 3
+        line_number = __LINE__ + 2
         begin
-          include Pending
           pending("TODO")
         rescue => error
           error.pending_caller.should == "#{file}:#{line_number}"

data/spec/spec/example/shared_example_group_spec.rb

@@ -151,7 +151,7 @@ module Spec
 
           example_group.it_should_behave_like("shared example_group")
           example_group.it("example") {example_ran = true}
-          example_group.run
+          example_group.run(options)
           example_ran.should be_true
           shared_example_ran.should be_true
         end
@@ -169,7 +169,7 @@ module Spec
 
           example_group.it_should_behave_like("shared example_group")
           example_group.it("example") {example_ran = true}
-          example_group.run
+          example_group.run(options)
           example_ran.should be_true
           shared_setup_ran.should be_true
           shared_teardown_ran.should be_true
@@ -188,7 +188,7 @@ module Spec
 
           example_group.it_should_behave_like("shared example_group")
           example_group.it("example") {example_ran = true}
-          example_group.run
+          example_group.run(options)
           example_ran.should be_true
           shared_before_all_run_count.should == 1
           shared_after_all_run_count.should == 1
@@ -224,7 +224,7 @@ module Spec
             mod1_method
             mod2_method
           end
-          example_group.run
+          example_group.run(options)
           mod1_method_called.should be_true
           mod2_method_called.should be_true
         end
@@ -241,7 +241,7 @@ module Spec
             a_shared_helper_method
             success = true
           end
-          example_group.run
+          example_group.run(options)
           success.should be_true
         end
 

data/spec/spec/matchers/description_generation_spec.rb

@@ -107,6 +107,11 @@ describe "Matchers should be able to generate their own descriptions" do
     [1,2,3].should include(3)
     Spec::Matchers.generated_description.should == "should include 3"
   end
+
+  it "array.should =~ [1,2,3]" do
+    [1,2,3].should =~ [1,2,3]
+    Spec::Matchers.generated_description.should == "should contain exactly 1, 2 and 3"
+  end
   
   it "should match" do
     "this string".should match(/this string/)

data/spec/spec/matchers/handler_spec.rb

@@ -54,14 +54,14 @@ module Spec
           matcher = mock("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(true)
-          ExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, matcher)
         end
       
         it "should explain when the matcher parameter is not a matcher" do
           begin
             nonmatcher = mock("nonmatcher")
             actual = Object.new
-            ExpectationMatcherHandler.handle_matcher(actual, nonmatcher)
+            Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, nonmatcher)
           rescue Spec::Expectations::InvalidMatcherError => e
           end
 
@@ -72,7 +72,7 @@ module Spec
           matcher = mock("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(:this_value)
-          ExpectationMatcherHandler.handle_matcher(actual, matcher).should == :this_value
+          Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, matcher).should == :this_value
         end
       end
     end
@@ -84,7 +84,7 @@ module Spec
           matcher.stub!(:matches?)
           actual = Object.new
           lambda {
-            NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+            Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
           }.should fail_with(/Matcher does not support should_not.\n/)
         end      
       
@@ -93,14 +93,14 @@ module Spec
           actual = Object.new
           matcher.stub!(:negative_failure_message)
           matcher.should_receive(:matches?).with(actual).and_return(false)
-          NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
         end
       
         it "should explain when the matcher parameter is not a matcher" do
           begin
             nonmatcher = mock("nonmatcher")
             actual = Object.new
-            NegativeExpectationMatcherHandler.handle_matcher(actual, nonmatcher)
+            Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, nonmatcher)
           rescue Spec::Expectations::InvalidMatcherError => e
           end
 
@@ -113,7 +113,7 @@ module Spec
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(false)
           matcher.stub!(:negative_failure_message).and_return("ignore")
-          NegativeExpectationMatcherHandler.handle_matcher(actual, matcher).should be_false
+          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher).should be_false
         end
       end
     end

data/spec/spec/matchers/match_array_spec.rb

@@ -0,0 +1,83 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "array.should =~ other_array" do
+  it "should pass if target contains all items" do
+    [1,2,3].should =~ [1,2,3]
+  end
+
+  it "should pass if target contains all items out of order" do
+    [1,3,2].should =~ [1,2,3]
+  end
+
+  it "should fail if target includes extra items" do
+    lambda {
+      [1,2,3,4].should =~ [1,2,3]
+    }.should fail_with(<<-MESSAGE)
+expected collection contained:  [1, 2, 3]
+actual collection contained:    [1, 2, 3, 4]
+the extra elements were:        [4]
+MESSAGE
+  end
+
+  it "should fail if target is missing items" do
+    lambda {
+      [1,2].should =~ [1,2,3]
+    }.should fail_with(<<-MESSAGE)
+expected collection contained:  [1, 2, 3]
+actual collection contained:    [1, 2]
+the missing elements were:      [3]
+MESSAGE
+  end
+
+  it "should fail if target is missing items and has extra items" do
+
+    lambda {
+      [1,2,4].should =~ [1,2,3]
+    }.should fail_with(<<-MESSAGE)
+expected collection contained:  [1, 2, 3]
+actual collection contained:    [1, 2, 4]
+the missing elements were:      [3]
+the extra elements were:        [4]
+MESSAGE
+  end
+
+  it "should sort items in the error message" do
+    lambda {
+      [6,2,1,5].should =~ [4,1,2,3]
+    }.should fail_with(<<-MESSAGE)
+expected collection contained:  [1, 2, 3, 4]
+actual collection contained:    [1, 2, 5, 6]
+the missing elements were:      [3, 4]
+the extra elements were:        [5, 6]
+MESSAGE
+  end
+
+  it "should accurately report extra elements when there are duplicates" do
+    lambda {
+      [1,1,1,5].should =~ [1,5]
+    }.should fail_with(<<-MESSAGE)
+expected collection contained:  [1, 5]
+actual collection contained:    [1, 1, 1, 5]
+the extra elements were:        [1, 1]
+MESSAGE
+  end
+
+  it "should accurately report missing elements when there are duplicates" do
+    lambda {
+      [1,5].should =~ [1,1,5]
+    }.should fail_with(<<-MESSAGE)
+expected collection contained:  [1, 1, 5]
+actual collection contained:    [1, 5]
+the missing elements were:      [1]
+MESSAGE
+  end
+
+end
+
+describe "should_not =~ [:with, :multiple, :args]" do
+  it "should not be supported" do
+    lambda {
+      [1,2,3].should_not =~ [1,2,3]
+    }.should fail_with(/Matcher does not support should_not/)
+  end
+end

data/spec/spec/matchers/raise_error_spec.rb

@@ -12,6 +12,24 @@ describe "should raise_error" do
   end
 end
 
+describe "should raise_error {|err| ... }" do
+  it "passes if there is an error" do
+    ran = false
+    lambda { non_existent_method }.should raise_error {|e|
+      ran = true
+    }
+    ran.should be_true
+  end
+
+  it "passes the error to the block" do
+    error = nil
+    lambda { non_existent_method }.should raise_error {|e|
+      error = e
+    }
+    error.should be_an_instance_of(NameError)
+  end
+end
+
 describe "should_not raise_error" do
   it "should pass if nothing is raised" do
     lambda {}.should_not raise_error

data/spec/spec/mocks/hash_including_matcher_spec.rb

@@ -27,6 +27,32 @@ module Spec
               hash_including(:a => anything, :b => 2).should == {:a => "1", :b => 2}
             end
           end
+          
+          describe "when passed only keys or keys mixed with key/value pairs" do
+            it "should match if the key is present" do
+              hash_including(:a).should == {:a => 1, :b => 2}
+            end
+            
+            it "should match if more keys are present" do
+              hash_including(:a, :b).should == {:a => 1, :b => 2, :c => 3}
+            end
+
+            it "should match a string against a given key" do
+              hash_including(:a).should == {:a => "1", :b => 2}
+            end
+
+            it "should match if passed one key and one key/value pair" do
+              hash_including(:a, :b => 2).should == {:a => 1, :b => 2}
+            end
+            
+            it "should match if passed many keys and one key/value pair" do
+              hash_including(:a, :b, :c => 3).should == {:a => 1, :b => 2, :c => 3, :d => 4}
+            end
+            
+            it "should match if passed many keys and many key/value pairs" do
+              hash_including(:a, :b, :c => 3, :e => 5).should == {:a => 1, :b => 2, :c => 3, :d => 4, :e => 5}
+            end
+          end
         end
         
         describe "failing" do
@@ -34,11 +60,22 @@ module Spec
             hash_including(:a => 1).should_not == 1
           end
 
-
           it "should not match a hash with a missing key" do
             hash_including(:a => 1).should_not == {:b => 2}
           end
-
+          
+          it "should not match a hash with a missing key" do
+            hash_including(:a).should_not == {:b => 2}
+          end
+          
+          it "should not match an empty hash with a given key" do
+            hash_including(:a).should_not == {}
+          end
+          
+          it "should not match a hash with a missing key when one pair is matching" do
+            hash_including(:a, :b => 2).should_not == {:b => 2}
+          end
+          
           it "should not match a hash with an incorrect value" do
             hash_including(:a => 1, :b => 2).should_not == {:a => 1, :b => 3}
           end

data/spec/spec/mocks/hash_not_including_matcher_spec.rb

@@ -0,0 +1,67 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    module ArgumentConstraints
+      describe HashNotIncludingConstraint do
+        
+        it "should describe itself properly" do
+          HashNotIncludingConstraint.new(:a => 5).description.should == "hash_not_including(:a=>5)"
+        end      
+
+        describe "passing" do
+          it "should match a hash without the specified key" do
+            hash_not_including(:c).should == {:a => 1, :b => 2}
+          end
+          
+          it "should match a hash with the specified key, but different value" do
+            hash_not_including(:b => 3).should == {:a => 1, :b => 2}
+          end
+                    
+          it "should match a hash without the specified key, given as anything()" do
+            hash_not_including(:c => anything).should == {:a => 1, :b => 2}
+          end
+
+          it "should match an empty hash" do
+            hash_not_including(:a).should == {}
+          end
+          
+          it "should match a hash without any of the specified keys" do
+            hash_not_including(:a, :b, :c).should == { :d => 7}
+          end
+          
+        end
+        
+        describe "failing" do
+          it "should not match a non-hash" do
+            hash_not_including(:a => 1).should_not == 1
+          end
+          
+          it "should not match a hash with a specified key" do
+            hash_not_including(:b).should_not == {:b => 2}
+          end
+          
+          it "should not match a hash with the specified key/value pair" do
+            hash_not_including(:b => 2).should_not == {:a => 1, :b => 2}
+          end
+          
+          it "should not match a hash with the specified key" do
+            hash_not_including(:a, :b => 3).should_not == {:a => 1, :b => 2}
+          end
+          
+          it "should not match a hash with one of the specified keys" do
+            hash_not_including(:a, :b).should_not == {:b => 2}
+          end
+          
+          it "should not match a hash with some of the specified keys" do
+            hash_not_including(:a, :b, :c).should_not == {:a => 1, :b => 2}
+          end
+          
+          it "should not match a hash with one key/value pair included" do
+            hash_not_including(:a, :b, :c, :d => 7).should_not == { :d => 7}
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec/mocks/mock_spec.rb

@@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 module Spec
   module Mocks
     describe Mock do
-
       before(:each) do
         @mock = mock("test mock")
       end
@@ -227,7 +226,7 @@ module Spec
       it "should yield 0 args to blocks that take a variable number of arguments" do
         @mock.should_receive(:yield_back).with(no_args()).once.and_yield
         a = nil
-        @mock.yield_back {|*a|}
+        @mock.yield_back {|*x| a = x}
         a.should == []
         @mock.rspec_verify
       end
@@ -245,7 +244,7 @@ module Spec
       it "should yield one arg to blocks that take a variable number of arguments" do
         @mock.should_receive(:yield_back).with(no_args()).once.and_yield(99)
         a = nil
-        @mock.yield_back {|*a|}
+        @mock.yield_back {|*x| a = x}
         a.should == [99]
         @mock.rspec_verify
       end
@@ -264,7 +263,7 @@ module Spec
       it "should yield many args to blocks that take a variable number of arguments" do
         @mock.should_receive(:yield_back).with(no_args()).once.and_yield(99, 27, "go")
         a = nil
-        @mock.yield_back {|*a|}
+        @mock.yield_back {|*x| a = x}
         a.should == [99, 27, "go"]
         @mock.rspec_verify
       end
@@ -283,7 +282,7 @@ module Spec
       it "should yield single value" do
         @mock.should_receive(:yield_back).with(no_args()).once.and_yield(99)
         a = nil
-        @mock.yield_back {|a|}
+        @mock.yield_back {|x| a = x}
         a.should == 99
         @mock.rspec_verify
       end
@@ -302,7 +301,7 @@ module Spec
       it "should yield two values" do
         @mock.should_receive(:yield_back).with(no_args()).once.and_yield('wha', 'zup')
         a, b = nil
-        @mock.yield_back {|a,b|}
+        @mock.yield_back {|x,y| a=x; b=y}
         a.should == 'wha'
         b.should == 'zup'
         @mock.rspec_verify

data/spec/spec/mocks/nil_expectation_warning_spec.rb

@@ -43,7 +43,7 @@ module Spec
                         nil.foo
                       end
                               
-        example_group.run.should be_true
+        example_group.run(Spec::Runner.options).should be_true
                   
       end
 

data/spec/spec/runner/formatter/base_text_formatter_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec/runner/formatter/base_text_formatter'
+
+module Spec
+  module Runner
+    module Formatter
+      describe BaseTextFormatter do
+        
+        before :all do
+          @sandbox = "spec/sandbox"
+        end
+
+        it "should create the directory contained in WHERE if it does not exist" do
+          FileUtils.should_receive(:mkdir_p).with(@sandbox)
+          File.stub!(:open)
+          BaseTextFormatter.new({},"#{@sandbox}/temp.rb")
+        end
+
+      end
+    end
+  end
+end

data/spec/spec/runner/option_parser_spec.rb

@@ -1,20 +1,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
-require 'fileutils'
-
-module Custom
-  class ExampleGroupRunner
-    attr_reader :options, :arg
-    def initialize(options, arg)
-      @options, @arg = options, arg
-    end
-
-    def load_files(files)
-    end
+require File.dirname(__FILE__) + '/resources/custom_example_group_runner'
 
-    def run
-    end
-  end  
-end
+require 'fileutils'
 
 describe "OptionParser" do
   before(:each) do
@@ -73,14 +60,14 @@ describe "OptionParser" do
   end
   
   it "should print help to stdout if no args and spec_comand?" do
-    Spec.stub!(:spec_command?).and_return(true)
+    Spec::Runner::OptionParser.stub!(:spec_command?).and_return(true)
     options = parse([])
     @out.rewind
     @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
   end
     
   it "should not print help to stdout if no args and NOT spec_command?" do
-    Spec.stub!(:spec_command?).and_return(false)
+    Spec::Runner::OptionParser.stub!(:spec_command?).and_return(false)
     options = parse([])
     @out.rewind
     @out.read.should == ""

data/spec/spec/runner/options_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/resources/custom_example_group_runner'
 
 module Spec
   module Runner
@@ -223,9 +224,24 @@ module Spec
           @options.reporter.options.should === @options
         end
       end
+      
+      describe "#number_of_examples" do
+        context "when --example is parsed" do
+          it "provides the number of examples parsed instead of the total number of examples collected" do
+            @example_group = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples") do
+              it "uses this example_group 1" do; end
+              it "uses this example_group 2" do; end
+              it "uses this example_group 3" do; end
+            end
+            @options.add_example_group @example_group
+            @options.parse_example("an example")
+            @options.number_of_examples.should == 1
+          end
+        end
+      end
 
       describe "#add_example_group affecting passed in example_group" do
-        it "runs all examples when options.examples is nil" do
+        it "runs all examples when options.examples is empty" do
           example_1_has_run = false
           example_2_has_run = false
           @example_group = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples") do
@@ -237,7 +253,7 @@ module Spec
             end
           end
 
-          @options.examples = nil
+          @options.examples.clear
 
           @options.add_example_group @example_group
           @options.run_examples
@@ -257,8 +273,6 @@ module Spec
             end
           end
 
-          @options.examples = []
-
           @options.add_example_group @example_group
           @options.run_examples
           example_1_has_run.should be_true

data/spec/spec/runner/resources/custom_example_group_runner.rb

@@ -0,0 +1,14 @@
+module Custom
+  class ExampleGroupRunner
+    attr_reader :options, :arg
+    def initialize(options, arg)
+      @options, @arg = options, arg
+    end
+
+    def load_files(files)
+    end
+
+    def run
+    end
+  end  
+end

data/spec/spec/runner/spec_parser_spec.rb

@@ -77,5 +77,15 @@ describe "SpecParser" do
     it "should find nested example" do
       parser.spec_name_for(file, 63).should == "e f 11"
     end
+
+    it "should handle paths which contain colons" do
+      fixture =
+         { "c:/somepath/somefile.rb:999:in 'method'" => "c:/somepath/somefile.rb",
+           "./somepath/somefile:999"                 => "./somepath/somefile" }
+      fixture.each_pair do |input, expected|
+        parser.send(:parse_backtrace, input ).should == [[expected, 999]]
+      end
+    end
+
   end
 end

data/spec/spec/spec_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe Spec::Runner, "#exit?" do
+  describe "when ::Test is absent during loading but present when running exit?" do
+    # believe it or not, this can happen when ActiveSupport is loaded after RSpec is, 
+    # since it loads active_support/core_ext/test/unit/assertions.rb which defines
+    # Test::Unit but doesn't actually load test/unit
+
+    before(:each) do
+      Object.const_set(:Test, Module.new)
+    end
+    
+    it "does not attempt to access the non-loaded test/unit library" do
+      lambda { Spec::Runner.exit? }.should_not raise_error
+    end
+    
+    after(:each) do
+      Object.send(:remove_const, :Test)
+    end
+  end
+end