dchelimsky-rspec 1.1.11 → 1.1.11.1

data/spec/spec/expectations/wrap_expectation_spec.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Matchers
+    describe "wrap_expectation" do
+      
+      def stub_matcher
+        @_stub_matcher ||= simple_matcher do
+        end
+      end
+      
+      def failing_matcher
+        @_failing_matcher ||= simple_matcher do
+          1.should == 2
+        end
+      end
+      
+      it "should return true if there is no error" do
+        wrap_expectation stub_matcher do
+        end.should be_true
+      end
+      
+      it "should return false if there is an error" do
+        wrap_expectation failing_matcher do
+          raise "error"
+        end.should be_false
+      end
+    end
+  end
+end

data/spec/spec/interop/test/unit/spec_spec.rb

@@ -2,11 +2,7 @@ require File.dirname(__FILE__) + '/test_unit_spec_helper'
 
 describe "ExampleGroup with test/unit/interop" do
   include TestUnitSpecHelper
-  
-  def resources
-    File.dirname(__FILE__) + "/resources"
-  end
-  
+    
   describe "with passing examples" do
     it "should output 0 failures" do
       output = ruby("#{resources}/spec_that_passes.rb")

data/spec/spec/interop/test/unit/test_unit_spec_helper.rb

@@ -3,6 +3,10 @@ require File.dirname(__FILE__) + '/../../../../ruby_forker'
 
 module TestUnitSpecHelper
   include RubyForker
+
+  def resources
+    File.dirname(__FILE__) + "/resources"
+  end
   
   def run_script(file_name)
     output = ruby(file_name)

data/spec/spec/matchers/be_close_spec.rb

@@ -1,38 +1,40 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Matchers
-    describe BeClose do
+    describe "be_close" do
       it "should match when value == target" do
-        BeClose.new(5.0, 0.5).matches?(5.0).should be_true
+        be_close(5.0, 0.5).matches?(5.0).should be_true
       end
       it "should match when value < (target + delta)" do
-        BeClose.new(5.0, 0.5).matches?(5.49).should be_true
+        be_close(5.0, 0.5).matches?(5.49).should be_true
       end
       it "should match when value > (target - delta)" do
-        BeClose.new(5.0, 0.5).matches?(4.51).should be_true
+        be_close(5.0, 0.5).matches?(4.51).should be_true
       end
       it "should not match when value == (target - delta)" do
-        BeClose.new(5.0, 0.5).matches?(4.5).should be_false
+        be_close(5.0, 0.5).matches?(4.5).should be_false
       end
       it "should not match when value < (target - delta)" do
-        BeClose.new(5.0, 0.5).matches?(4.49).should be_false
+        be_close(5.0, 0.5).matches?(4.49).should be_false
       end
       it "should not match when value == (target + delta)" do
-        BeClose.new(5.0, 0.5).matches?(5.5).should be_false
+        be_close(5.0, 0.5).matches?(5.5).should be_false
       end
       it "should not match when value > (target + delta)" do
-        BeClose.new(5.0, 0.5).matches?(5.51).should be_false
+        be_close(5.0, 0.5).matches?(5.51).should be_false
       end
       it "should provide a useful failure message" do
         #given
-          matcher = BeClose.new(5.0, 0.5)
+          matcher = be_close(5.0, 0.5)
         #when
           matcher.matches?(5.51)
         #then
           matcher.failure_message.should == "expected 5.0 +/- (< 0.5), got 5.51"
       end
       it "should describe itself" do
-        BeClose.new(5.0, 0.5).description.should == "be close to 5.0 (within +- 0.5)"
+        matcher = be_close(5.0, 0.5)
+        matcher.matches?(5.1)
+        matcher.description.should == "be close to 5.0 (within +- 0.5)"
       end
     end
   end

data/spec/spec/matchers/description_generation_spec.rb

@@ -130,7 +130,7 @@ describe "Matchers should be able to generate their own descriptions" do
   
   it "should respond_to" do
     [].should respond_to(:insert)
-    Spec::Matchers.generated_description.should == "should respond to #insert"
+    Spec::Matchers.generated_description.should == "should respond to [:insert]"
   end
   
   it "should throw symbol" do

data/spec/spec/matchers/eql_spec.rb

@@ -2,24 +2,25 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Matchers
-    describe Eql do
+    describe "eql" do
       it "should match when actual.eql?(expected)" do
-        Eql.new(1).matches?(1).should be_true
+        eql(1).matches?(1).should be_true
       end
       it "should not match when !actual.eql?(expected)" do
-        Eql.new(1).matches?(2).should be_false
+        eql(1).matches?(2).should be_false
       end
       it "should describe itself" do
-        matcher = Eql.new(1)
+        matcher = eql(1)
+        matcher.matches?(1)
         matcher.description.should == "eql 1"
       end
       it "should provide message, expected and actual on #failure_message" do
-        matcher = Eql.new("1")
+        matcher = eql("1")
         matcher.matches?(1)
         matcher.failure_message.should == ["expected \"1\", got 1 (using .eql?)", "1", 1]
       end
       it "should provide message, expected and actual on #negative_failure_message" do
-        matcher = Eql.new(1)
+        matcher = eql(1)
         matcher.matches?(1)
         matcher.negative_failure_message.should == ["expected 1 not to equal 1 (using .eql?)", 1, 1]
       end

data/spec/spec/matchers/equal_spec.rb

@@ -2,24 +2,25 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Matchers
-    describe Equal do
+    describe "equal" do
       it "should match when actual.equal?(expected)" do
-        Equal.new(1).matches?(1).should be_true
+        equal(1).matches?(1).should be_true
       end
       it "should not match when !actual.equal?(expected)" do
-        Equal.new("1").matches?("1").should be_false
+        equal("1").matches?("1").should be_false
       end
       it "should describe itself" do
-        matcher = Equal.new(1)
+        matcher = equal(1)
+        matcher.matches?(1)
         matcher.description.should == "equal 1"
       end
       it "should provide message, expected and actual on #failure_message" do
-        matcher = Equal.new("1")
+        matcher = equal("1")
         matcher.matches?(1)
         matcher.failure_message.should == ["expected \"1\", got 1 (using .equal?)", "1", 1]
       end
       it "should provide message, expected and actual on #negative_failure_message" do
-        matcher = Equal.new(1)
+        matcher = equal(1)
         matcher.matches?(1)
         matcher.negative_failure_message.should == ["expected 1 not to equal 1 (using .equal?)", 1, 1]
       end

data/spec/spec/matchers/has_spec.rb

@@ -52,7 +52,7 @@ describe "should_not have_sym(*args)" do
   end
 end
 
-describe Spec::Matchers::Has do
+describe "has" do
   it "should work when the target implements #send" do
     o = {:a => "A"}
     def o.send(*args); raise "DOH! Library developers shouldn't use #send!" end

data/spec/spec/matchers/have_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-module HaveSpecHelper
+share_as :HaveSpecHelper do
   def create_collection_owner_with(n)
     owner = Spec::Expectations::Helper::CollectionOwner.new
     (1..n).each do |n|
@@ -9,8 +9,21 @@ module HaveSpecHelper
     end
     owner
   end
+  before(:each) do
+    unless defined?(ActiveSupport::Inflector)
+      @active_support_was_not_defined
+      module ActiveSupport
+        class Inflector
+          def self.pluralize(string)
+            string.to_s + 's'
+          end
+        end
+      end
+    end
+  end
 end
 
+
 describe "should have(n).items" do
   include HaveSpecHelper
 
@@ -50,19 +63,6 @@ end
 describe 'should have(1).item when ActiveSupport::Inflector is defined' do
   include HaveSpecHelper
   
-  before(:each) do
-    unless defined?(ActiveSupport::Inflector)
-      @active_support_was_not_defined
-      module ActiveSupport
-        class Inflector
-          def self.pluralize(string)
-            string.to_s + 's'
-          end
-        end
-      end
-    end
-  end
-  
   it 'should pluralize the collection name' do
     owner = create_collection_owner_with(1)
     owner.should have(1).item
@@ -70,7 +70,7 @@ describe 'should have(1).item when ActiveSupport::Inflector is defined' do
   
   after(:each) do
     if @active_support_was_not_defined
-      Object.send :remove_const, :ActiveSupport
+      Object.__send__ :remove_const, :ActiveSupport
     end
   end
 end
@@ -96,7 +96,7 @@ describe 'should have(1).item when Inflector is defined' do
 
   after(:each) do
     if @inflector_was_not_defined
-      Object.send :remove_const, :Inflector
+      Object.__send__ :remove_const, :Inflector
     end
   end
 end
@@ -327,7 +327,7 @@ end
 
 describe Spec::Matchers::Have, "for a collection owner that implements #send" do
   include HaveSpecHelper
-
+  
   before(:each) do
     @collection = Object.new
     def @collection.floozles; [1,2] end
@@ -357,7 +357,12 @@ module Spec
   module Matchers
     describe Have do
       it "should have method_missing as private" do
-        Have.private_instance_methods.should include("method_missing")
+        with_ruby '1.8' do
+          Have.private_instance_methods.should include("method_missing")
+        end
+        with_ruby '1.9' do
+          Have.private_instance_methods.should include(:method_missing)
+        end
       end
       
       describe "respond_to?" do

data/spec/spec/matchers/include_spec.rb

@@ -5,6 +5,10 @@ describe "should include(expected)" do
     [1,2,3].should include(3)
     "abc".should include("a")
   end
+  
+  it 'should pass if target is a Hash and has the expected as a key' do
+    {:key => 'value'}.should include(:key)
+  end
 
   it "should fail if target does not include expected" do
     lambda {
@@ -13,6 +17,9 @@ describe "should include(expected)" do
     lambda {
       "abc".should include("d")
     }.should fail_with("expected \"abc\" to include \"d\"")
+    lambda {
+      {:key => 'value'}.should include(:other)
+    }.should fail_with(%Q|expected {:key=>"value"} to include :other|)
   end
 end
 
@@ -20,12 +27,22 @@ describe "should include(with, multiple, args)" do
   it "should pass if target includes all items" do
     [1,2,3].should include(1,2,3)
   end
+  
+  it 'should pass if target is a Hash including all items as keys' do
+    {:key => 'value', :other => 'value'}.should include(:key, :other)
+  end
 
   it "should fail if target does not include any one of the items" do
     lambda {
       [1,2,3].should include(1,2,4)
     }.should fail_with("expected [1, 2, 3] to include 1, 2 and 4")
   end
+  
+  it 'should pass if target is a Hash missing any item as a key' do
+    lambda {
+      {:key => 'value'}.should include(:key, :other)
+    }.should fail_with(%Q|expected {:key=>"value"} to include :key and :other|)
+  end
 end
 
 describe "should_not include(expected)" do
@@ -33,6 +50,10 @@ describe "should_not include(expected)" do
     [1,2,3].should_not include(4)
     "abc".should_not include("d")
   end
+  
+  it 'should pass if target is a Hash and does not have the expected as a key' do
+    {:other => 'value'}.should_not include(:key)
+  end
 
   it "should fail if target includes expected" do
     lambda {
@@ -41,6 +62,9 @@ describe "should_not include(expected)" do
     lambda {
       "abc".should_not include("c")
     }.should fail_with("expected \"abc\" not to include \"c\"")
+    lambda {
+      {:key => 'value'}.should_not include(:key)
+    }.should fail_with(%Q|expected {:key=>"value"} not to include :key|)
   end
 end
 

data/spec/spec/matchers/matcher_methods_spec.rb

@@ -16,18 +16,9 @@ This module should provide the following methods, each of which returns a Matche
       it "be_arbitrary_predicate" do
         be_arbitrary_predicate.should be_an_instance_of(Be)
       end
-      it "be_close" do
-        be_close(1,2).should be_an_instance_of(BeClose)
-      end
       it "change" do
         change("target", :message).should be_an_instance_of(Change)
       end
-      it "eql" do
-        eql(:expected).should be_an_instance_of(Eql)
-      end
-      it "equal" do
-        equal(:expected).should be_an_instance_of(Equal)
-      end
       it "have" do
         have(0).should be_an_instance_of(Have)
       end
@@ -43,9 +34,6 @@ This module should provide the following methods, each of which returns a Matche
       it "include" do
         include(:value).should be_an_instance_of(Include)
       end
-      it "match" do
-        match(:value).should be_an_instance_of(Match)
-      end
       it "raise_error" do
         raise_error.should be_an_instance_of(RaiseError)
         raise_error(NoMethodError).should be_an_instance_of(RaiseError)
@@ -70,7 +58,7 @@ This module should provide the following methods, each of which returns a Matche
       end
 
       it "should convert have_xyz to Has(:have_xyz)" do
-        Has.should_receive(:new).with(:have_whatever)
+        self.should_receive(:has).with(:have_whatever)
         have_whatever
       end
     end

data/spec/spec/matchers/throw_symbol_spec.rb

@@ -5,7 +5,7 @@ module Spec
     describe ThrowSymbol do
       describe "with no args" do
         before(:each) { @matcher = ThrowSymbol.new }
-
+      
         it "should match if any Symbol is thrown" do
           @matcher.matches?(lambda{ throw :sym }).should be_true
         end
@@ -24,7 +24,7 @@ module Spec
           @matcher.negative_failure_message.should == "expected no Symbol, got :sym"
         end
       end
-    
+          
       describe "with a symbol" do
         before(:each) { @matcher = ThrowSymbol.new(:sym) }
       
@@ -56,7 +56,7 @@ module Spec
           @matcher.matches?(lambda{ sym }).should be_false
         end
       end
-  
+
       describe "with a symbol and an arg" do
         before(:each) { @matcher = ThrowSymbol.new(:sym, "a") }
     

data/spec/spec/mocks/bug_report_11545_spec.rb

@@ -1,13 +1,11 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 class LiarLiarPantsOnFire
-  include Spec::MetaClass
-  extend Spec::MetaClass
-  def respond_to?(sym)
+  def respond_to?(sym, incl_private=false)
     true
   end
   
-  def self.respond_to?(sym)
+  def self.respond_to?(sym, incl_private=false)
     true
   end
 end
@@ -28,6 +26,7 @@ describe 'should_receive' do
   end
   
   it 'should cleanup after itself' do
-    LiarLiarPantsOnFire.metaclass.instance_methods.should_not include("something")
+    (class << LiarLiarPantsOnFire; self; end).instance_methods.should_not include("something")
   end
 end
+

data/spec/spec/mocks/bug_report_496.rb

@@ -1,16 +1,18 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-class BaseClass
-end
+module BugReport496
+  class BaseClass
+  end
 
-class SubClass < BaseClass
-end
+  class SubClass < BaseClass
+  end
 
-describe "a message expectation on a base class object" do
-  it "should correctly pick up message sent to it subclass" do
-    pending("fix for http://rspec.lighthouseapp.com/projects/5645-rspec/tickets/496") do
-      BaseClass.should_receive(:new).once
-      SubClass.new
+  describe "a message expectation on a base class object" do
+    it "should correctly pick up message sent to it subclass" do
+      pending("fix for http://rspec.lighthouseapp.com/projects/5645/tickets/496") do
+        BaseClass.should_receive(:new).once
+        SubClass.new
+      end
     end
   end
 end

data/spec/spec/mocks/bug_report_600_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module BugReport600
+  class ExampleClass
+    def self.method_that_uses_define_method
+      define_method "defined_method" do |attributes|
+        load_address(address, attributes)
+      end
+    end
+  end
+ 
+  describe "stubbing a class method" do
+    it "should work" do
+      ExampleClass.should_receive(:define_method).with("defined_method")
+      ExampleClass.method_that_uses_define_method
+    end
+
+    it "should restore the original method" do
+      ExampleClass.method_that_uses_define_method
+    end
+  end
+end

data/spec/spec/runner/formatter/nested_text_formatter_spec.rb

@@ -300,7 +300,7 @@ OUT
                 formatter.example_pending(example_group.examples.first, 'reason', "#{__FILE__}:#{__LINE__}")
                 io.rewind
                 formatter.dump_pending
-                io.string.should =~ /Pending\:\nExampleGroup example \(reason\)\n/
+                io.string.should =~ /Pending\:\n\nExampleGroup example \(reason\)\n/
               end
             end
 

data/spec/spec/runner/formatter/progress_bar_formatter_spec.rb

@@ -88,17 +88,6 @@ EOE
 EOE
         end
         
-        it "should dump pending" do
-          example_group = ExampleGroup.describe("example_group") do
-            specify "example" do
-            end
-          end
-          example = example_group.examples.first
-          @formatter.example_pending(example, "message", "#{__FILE__}:#{__LINE__}")
-          @formatter.dump_pending
-          @io.string.should =~ /Pending\:\nexample_group example \(message\)\n/
-        end
-        
         it "should dump pending with file and line number" do
           example_group = ExampleGroup.describe("example_group") do
             specify "example" do
@@ -112,8 +101,9 @@ EOE
           @io.string.should ==(<<-HERE)
 *
 Pending:
+
 example_group example (message)
-  Called from #{file}:#{line}
+#{file}:#{line}
 HERE
         end
       end
@@ -124,11 +114,11 @@ HERE
           @options = mock('options')
           @out.stub!(:puts)
           @formatter = ProgressBarFormatter.new(@options, @out)
-          @formatter.class.send :public, :output_to_tty?
+          @formatter.class.__send__ :public, :output_to_tty?
         end
 
         after(:each) do
-          @formatter.class.send :protected, :output_to_tty?
+          @formatter.class.__send__ :protected, :output_to_tty?
         end
 
         it "should not throw NoMethodError on output_to_tty?" do

data/spec/spec/runner/formatter/specdoc_formatter_spec.rb

@@ -141,7 +141,7 @@ module Spec
                 formatter.example_pending(example_group.examples.first, 'reason', "#{__FILE__}:#{__LINE__}")
                 io.rewind
                 formatter.dump_pending
-                io.string.should =~ /Pending\:\nExampleGroup example \(reason\)\n/
+                io.string.should =~ /Pending\:\n\nExampleGroup example \(reason\)\n/
               end
             end
 

data/spec/spec/runner/options_spec.rb

@@ -212,7 +212,7 @@ module Spec
       describe "#load_class" do
         it "should raise error when not class name" do
           lambda do
-            @options.send(:load_class, 'foo', 'fruit', '--food')
+            @options.__send__(:load_class, 'foo', 'fruit', '--food')
           end.should raise_error('"foo" is not a valid class name')
         end
       end