rspec 1.3.0 → 1.3.1

data/spec/spec/matchers/match_array_spec.rb

@@ -66,7 +66,8 @@ the extra elements were:        [5, 6]
 MESSAGE
   end
 
-    it "should not sort items in the error message if they don't all respond to <=>" do
+  it "should not sort items in the error message if they don't all respond to <=>" do
+    with_ruby 1.8 do
       lambda {
         [UnsortableObject.new(2), UnsortableObject.new(1)].should =~ [UnsortableObject.new(4), UnsortableObject.new(3)]
       }.should fail_with(<<-MESSAGE)
@@ -76,6 +77,7 @@ the missing elements were:      [4, 3]
 the extra elements were:        [2, 1]
 MESSAGE
     end
+  end
 
   it "should accurately report extra elements when there are duplicates" do
     lambda {
@@ -97,6 +99,11 @@ the missing elements were:      [1]
 MESSAGE
   end
 
+  it "should work with subclasses of Array" do
+    class SuperArray < Array; end
+    SuperArray.new([1,2,3]).should =~ SuperArray.new([3,2,1])
+  end
+
 end
 
 describe "should_not =~ [:with, :multiple, :args]" do

data/spec/spec/matchers/simple_matcher_spec.rb

@@ -3,6 +3,13 @@ require 'spec_helper'
 module Spec
   module Matchers
     describe SimpleMatcher do
+      before { Spec.stub(:deprecate) }
+
+      it "is deprecated" do
+        Spec.should_receive(:deprecate)
+        simple_matcher("foo") {}
+      end
+
       it "should pass match arg to block" do
         actual = nil
         matcher = simple_matcher("message") do |given| actual = given end
@@ -35,59 +42,59 @@ module Spec
           matcher.matches?("anything").should be_true
         end.should fail_with(/expected: 3/)
       end
-    end
     
-    describe "with arity of 2" do
-      it "should provide the matcher so you can access its messages" do
-        provided_matcher = nil
-        matcher = simple_matcher("thing") do |given, matcher|
-          provided_matcher = matcher
+      describe "with arity of 2" do
+        it "should provide the matcher so you can access its messages" do
+          provided_matcher = nil
+          matcher = simple_matcher("thing") do |given, matcher|
+            provided_matcher = matcher
+          end
+          matcher.matches?("anything")
+          provided_matcher.should equal(matcher)
         end
-        matcher.matches?("anything")
-        provided_matcher.should equal(matcher)
-      end
-      
-      it "should support a custom failure message" do
-        matcher = simple_matcher("thing") do |given, matcher|
-          matcher.failure_message = "custom message"
+        
+        it "should support a custom failure message" do
+          matcher = simple_matcher("thing") do |given, matcher|
+            matcher.failure_message = "custom message"
+          end
+          matcher.matches?("other")
+          matcher.failure_message.should == "custom message"
         end
-        matcher.matches?("other")
-        matcher.failure_message.should == "custom message"
-      end
 
-      it "should complain when asked for a failure message if you don't give it a description or a message" do
-        matcher = simple_matcher do |given, matcher| end
-        matcher.matches?("other")
-        matcher.failure_message.should =~ /No description provided/
-      end
+        it "should complain when asked for a failure message if you don't give it a description or a message" do
+          matcher = simple_matcher do |given, matcher| end
+          matcher.matches?("other")
+          matcher.failure_message.should =~ /No description provided/
+        end
 
-      it "should support a custom negative failure message" do
-        matcher = simple_matcher("thing") do |given, matcher|
-          matcher.negative_failure_message = "custom message"
+        it "should support a custom negative failure message" do
+          matcher = simple_matcher("thing") do |given, matcher|
+            matcher.negative_failure_message = "custom message"
+          end
+          matcher.matches?("other")
+          matcher.negative_failure_message.should == "custom message"
+        end
+        
+        it "should complain when asked for a negative failure message if you don't give it a description or a message" do
+          matcher = simple_matcher do |given, matcher| end
+          matcher.matches?("other")
+          matcher.negative_failure_message.should =~ /No description provided/
         end
-        matcher.matches?("other")
-        matcher.negative_failure_message.should == "custom message"
-      end
-      
-      it "should complain when asked for a negative failure message if you don't give it a description or a message" do
-        matcher = simple_matcher do |given, matcher| end
-        matcher.matches?("other")
-        matcher.negative_failure_message.should =~ /No description provided/
-      end
 
-      it "should support a custom description" do
-        matcher = simple_matcher("thing") do |given, matcher|
-          matcher.description = "custom message"
+        it "should support a custom description" do
+          matcher = simple_matcher("thing") do |given, matcher|
+            matcher.description = "custom message"
+          end
+          matcher.matches?("description")
+          matcher.description.should == "custom message"
         end
-        matcher.matches?("description")
-        matcher.description.should == "custom message"
-      end
 
-      it "should tell you no description was provided when it doesn't receive one" do
-        matcher = simple_matcher do end
-        matcher.description.should =~ /No description provided/
+        it "should tell you no description was provided when it doesn't receive one" do
+          matcher = simple_matcher do end
+          matcher.description.should =~ /No description provided/
+        end
       end
+      
     end
-    
   end
-end
+end

data/spec/spec/matchers/throw_symbol_spec.rb

@@ -4,7 +4,7 @@ module Spec
   module Matchers
     describe ThrowSymbol do
       describe "with no args" do
-        let(:matcher) { ThrowSymbol.new }
+        let(:matcher) { throw_symbol }
 
         it "matches if any Symbol is thrown" do
           matcher.matches?(lambda{ throw :sym }).should be_true
@@ -30,7 +30,7 @@ module Spec
       end
 
       describe "with a symbol" do
-        let(:matcher) { ThrowSymbol.new(:sym) }
+        let(:matcher) { throw_symbol(:sym) }
 
         it "matches if correct Symbol is thrown" do
           matcher.matches?(lambda{ throw :sym }).should be_true
@@ -75,7 +75,7 @@ module Spec
       end
 
       describe "with a symbol and an arg" do
-        let(:matcher) { ThrowSymbol.new(:sym, "a") }
+        let(:matcher) { throw_symbol(:sym, "a") }
 
         it "matches if correct Symbol and args are thrown" do
           matcher.matches?(lambda{ throw :sym, "a" }).should be_true

data/spec/spec/mocks/bug_report_496_spec.rb

@@ -9,10 +9,8 @@ module BugReport496
 
   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
+      BaseClass.should_receive(:new).once
+      SubClass.new
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+$: << '.' # for ruby 1.9
 require 'stringio'
 
 $_spec_spec = true # Prevents Kernel.exit in various places
@@ -109,4 +110,4 @@ end
 
 Spec::Runner.configure do |config|
   config.extend(Macros)
-end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  hash: 25
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,69 +15,119 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -06:00
+date: 2010-10-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: rubyforge
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
         version: "0.3"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: fakefs
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
         version: 0.2.1
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: syntax
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
         version: 1.1.2
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: heckle
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 4
+        - 3
         version: 1.4.3
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 19
+        segments: 
+        - 2
+        - 6
+        - 2
+        version: 2.6.2
+  type: :development
+  version_requirements: *id007
 description: Behaviour Driven Development for Ruby.
 email: 
 - rspec-devel@rubyforge.org
@@ -477,7 +533,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-1.3.0
+    Thank you for installing rspec-1.3.1
   
     Please be sure to read History.rdoc and Upgrade.rdoc
     for useful information about this release.
@@ -490,23 +546,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec 1.3.0
+summary: rspec 1.3.1
 test_files: []