rspec-expectations 2.5.0 → 2.6.0.rc2

data/.travis.yml

@@ -0,0 +1,7 @@
+script: "rake"
+rvm:
+  - 1.8.6
+  - 1.8.7
+  - 1.9.1
+  - 1.9.2
+  - ree

data/Gemfile

@@ -6,29 +6,31 @@ source "http://rubygems.org"
   if File.exist?(library_path)
     gem lib, :path => library_path
   else
-    gem lib
+    gem lib, :git => "git://github.com/rspec/#{lib}.git"
   end
 end
 
 ### dev dependencies
 gem "rake", "0.8.7"
-gem "cucumber", "0.9.4"
-gem "aruba", "0.2.2"
-gem "rcov", "0.9.9"
+# gem "cucumber", "~> 0.10.2"
+# gem "aruba", :git => "git://github.com/aslakhellesoy/aruba"
+gem "rcov", "0.9.9", :platforms => :mri
 gem "relish", "0.2.0"
 gem "guard-rspec", "0.1.9"
 gem "growl", "1.0.3"
-gem "ZenTest", "~> 4.4.2"
+gem "nokogiri", "1.4.4"
 
-if RUBY_PLATFORM =~ /darwin/
-  gem "autotest-fsevent", "~> 0.2.4"
-  gem "autotest-growl", "~> 0.2.9"
+platforms :mri_18 do
+  gem 'ruby-debug'
 end
 
-gem "ruby-debug", :platforms => :ruby_18
-gem "ruby-debug19", "~> 0.11.6", :platforms => :ruby_19
+platforms :mri_19 do
+  gem 'linecache19', '0.5.11' # 0.5.12 cannot install on 1.9.1, and 0.5.11 appears to work with both 1.9.1 & 1.9.2
+  gem 'ruby-debug19'
+  gem 'ruby-debug-base19', RUBY_VERSION == '1.9.1' ? '0.11.23' : '~> 0.11.24'
+end
 
-platforms :ruby_18, :ruby_19 do
+platforms :mri_18, :mri_19 do
   gem "rb-fsevent", "~> 0.3.9"
   gem "ruby-prof", "~> 0.9.2"
 end

data/README.md

@@ -3,6 +3,8 @@
 rspec-expectations adds `should` and `should_not` to every object and includes
 RSpec::Matchers, a library of standard matchers.
 
+[![build status](http://travis-ci.org/rspec/rspec-expectations.png)](http://travis-ci.org/rspec/rspec-expectations)
+
 ## Documentation
 
 The [Cucumber features](http://relishapp.com/rspec/rspec-expectations)

data/Rakefile

@@ -6,16 +6,38 @@ require 'rake'
 require 'rake/rdoctask'
 require 'rspec/core/rake_task'
 require 'rspec/expectations/version'
-require 'cucumber/rake/task'
 
-class Cucumber::Rake::Task::ForkedCucumberRunner
-  # When cucumber shells out, we still need it to run in the context of our
-  # bundle.
-  def run
-    sh "bundle exec #{RUBY} " + args.join(" ")
+begin
+  require 'cucumber/rake/task'
+
+  class Cucumber::Rake::Task::ForkedCucumberRunner
+    # When cucumber shells out, we still need it to run in the context of our
+    # bundle.
+    def run
+      sh "bundle exec #{RUBY} " + args.join(" ")
+    end
+  end
+
+  Cucumber::Rake::Task.new(:cucumber)
+
+  namespace :cucumber do
+    desc "Run cucumber features using rcov"
+    Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
+      t.cucumber_opts = %w{--format progress}
+      t.rcov = true
+      t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
+      t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
+    end
   end
+
+rescue LoadError => e
+  puts "unable to load cucumber, some tasks unavailable"
+  task :cucumber do
+    #no-op
+   end
 end
 
+
 task :cleanup_rcov_files do
   rm_rf 'coverage.data'
 end
@@ -25,7 +47,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w[--color]
 end
 
-Cucumber::Rake::Task.new(:cucumber)
 
 namespace :spec do
   desc "Run all examples using rcov"
@@ -36,16 +57,6 @@ namespace :spec do
   end
 end
 
-namespace :cucumber do
-  desc "Run cucumber features using rcov"
-  Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
-    t.cucumber_opts = %w{--format progress}
-    t.rcov = true
-    t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
-    t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
-  end
-end
-
 task :default => [:spec, :cucumber]
 
 Rake::RDocTask.new do |rdoc|

data/features/Changelog.md

@@ -1,3 +1,19 @@
+### 2.6.0.rc2 / 2011-04-18
+
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.5.0...v2.6.1.rc2)
+
+* Enhancments
+  * `change` matcher accepts Regexps (Robert Davis)
+  * better descriptions for have_xxx matchers (Magnus Bergmark)
+
+* Bug fixes
+  * Removed non-ascii characters that were choking rcov (Geoffrey Byers)
+  * change matcher dups arrays and hashes so their before/after states can be
+    compared correctly.
+  * Fix the order of inclusion of RSpec::Matchers in
+    Test::Unit::TestCase and MiniTest::Unit::TestCase to prevent a
+    SystemStackError (Myron Marston)
+
 ### 2.5.0 / 2011-02-05
 
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.4.0...v2.5.0)

data/features/built_in_matchers/be.feature

@@ -25,7 +25,7 @@ Feature: "be" matchers
         specify { false.should be_true }
       end
       """
-    When I run "rspec be_true_spec.rb"
+    When I run `rspec be_true_spec.rb`
     Then the output should contain all of these:
       | 10 examples, 5 failures       |
       | expected true not to be true  |
@@ -52,7 +52,7 @@ Feature: "be" matchers
         specify { "foo".should be_false }
       end
       """
-    When I run "rspec be_false_spec.rb"
+    When I run `rspec be_false_spec.rb`
     Then the output should contain all of these:
       | 10 examples, 5 failures        |
       | expected nil not to be false   |
@@ -79,7 +79,7 @@ Feature: "be" matchers
         specify { "foo".should be_nil }
       end
       """
-    When I run "rspec be_nil_spec.rb"
+    When I run `rspec be_nil_spec.rb`
     Then the output should contain "10 examples, 5 failures"
     And the output should contain:
       """
@@ -125,7 +125,7 @@ Feature: "be" matchers
         specify { false.should be }
       end
       """
-    When I run "rspec be_spec.rb"
+    When I run `rspec be_spec.rb`
     Then the output should contain all of these:
       | 10 examples, 5 failures             |
       | expected true to evaluate to false  |

data/features/built_in_matchers/be_within.feature

@@ -34,7 +34,7 @@ Feature: be_within matcher
         it { should be_within(0.5).of(27) }
       end
       """
-    When I run "rspec be_within_matcher_spec.rb"
+    When I run `rspec be_within_matcher_spec.rb`
     Then the output should contain all of these:
       | 8 examples, 4 failures                     |
       | expected 27.5 not to be within 0.5 of 27.9 |

data/features/built_in_matchers/equality.feature

@@ -42,7 +42,7 @@ Feature: equality matchers
         end
       end
       """
-    When I run "rspec compare_using_eq.rb"
+    When I run `rspec compare_using_eq.rb`
     Then the output should contain "3 examples, 0 failures"
 
   Scenario: compare using ==
@@ -66,7 +66,7 @@ Feature: equality matchers
         end
       end
       """
-    When I run "rspec compare_using_==.rb"
+    When I run `rspec compare_using_==.rb`
     Then the output should contain "3 examples, 0 failures"
 
   Scenario: compare using eql (eql?)
@@ -89,7 +89,7 @@ Feature: equality matchers
 
       end
       """
-    When I run "rspec compare_using_eql.rb"
+    When I run `rspec compare_using_eql.rb`
     Then the output should contain "3 examples, 0 failures"
 
   Scenario: compare using equal (equal?)
@@ -113,7 +113,7 @@ Feature: equality matchers
 
       end
       """
-    When I run "rspec compare_using_equal.rb"
+    When I run `rspec compare_using_equal.rb`
     Then the output should contain "3 examples, 0 failures"
 
   Scenario: compare using be (equal?)
@@ -137,6 +137,6 @@ Feature: equality matchers
 
       end
       """
-    When I run "rspec compare_using_be.rb"
+    When I run `rspec compare_using_be.rb`
     Then the output should contain "3 examples, 0 failures"
 

data/features/built_in_matchers/exist.feature

@@ -36,7 +36,7 @@ Feature: exist matcher
         it { should exist } # deliberate failure
       end
       """
-    When I run "rspec exist_matcher_spec.rb"
+    When I run `rspec exist_matcher_spec.rb`
     Then the output should contain all of these:
       | 4 examples, 2 failures                |
       | expected <Planet: Earth> not to exist |

data/features/built_in_matchers/expect_change.feature

@@ -35,7 +35,7 @@ Feature: expect change
         end
       end
       """
-    When I run "rspec spec/example_spec.rb"
+    When I run `rspec spec/example_spec.rb`
     Then the output should contain "1 failure"
     Then the output should contain "should have been changed by 2, but was changed by 1"
 
@@ -54,6 +54,6 @@ Feature: expect change
         end
       end
       """
-    When I run "rspec spec/example_spec.rb"
+    When I run `rspec spec/example_spec.rb`
     Then the output should contain "2 failures"
     Then the output should contain "should not have changed, but did change from 1 to 2"

data/features/built_in_matchers/expect_error.feature

@@ -24,7 +24,7 @@ Feature: raise_error matcher
         end
       end
       """
-    When I run "rspec expect_error_spec.rb"
+    When I run `rspec expect_error_spec.rb`
     Then the example should pass
 
   Scenario: expect specific error
@@ -36,7 +36,7 @@ Feature: raise_error matcher
         end
       end
       """
-    When I run "rspec expect_error_spec.rb"
+    When I run `rspec expect_error_spec.rb`
     Then the example should pass
 
   Scenario: expect specific error message using a string
@@ -49,7 +49,7 @@ Feature: raise_error matcher
         end
       end
       """
-    When I run "rspec expect_error_with_message.rb"
+    When I run `rspec expect_error_with_message.rb`
     Then the example should pass
 
   Scenario: expect specific error message using a regular expression
@@ -62,7 +62,7 @@ Feature: raise_error matcher
         end
       end
       """
-    When I run "rspec expect_error_with_regex.rb"
+    When I run `rspec expect_error_with_regex.rb`
     Then the example should pass
 
   Scenario: set expectations on error object passed to block
@@ -76,7 +76,7 @@ Feature: raise_error matcher
         end
       end
       """
-      When I run "rspec expect_error_with_block_spec.rb"
+      When I run `rspec expect_error_with_block_spec.rb`
       Then the example should pass
 
   Scenario: expect no error at all
@@ -88,7 +88,7 @@ Feature: raise_error matcher
         end
       end
       """
-    When I run "rspec expect_no_error_spec.rb"
+    When I run `rspec expect_no_error_spec.rb`
     Then the example should pass
     
   Scenario: expect no occurence of a specific error
@@ -101,5 +101,5 @@ Feature: raise_error matcher
         end
       end
       """
-    When I run "rspec expect_no_error_spec.rb"
+    When I run `rspec expect_no_error_spec.rb`
     Then the example should pass

data/features/built_in_matchers/have.feature

@@ -51,7 +51,7 @@ Feature: have(n).items matcher
         it { should have_at_most(2).items }
       end
       """
-     When I run "rspec have_items_spec.rb"
+     When I run `rspec have_items_spec.rb`
      Then the output should contain "16 examples, 8 failures"
       And the output should contain "expected target not to have 3 items, got 3"
       And the output should contain "expected 2 items, got 3"
@@ -93,7 +93,7 @@ Feature: have(n).items matcher
         it { should have_at_most(4).words }
       end
       """
-     When I run "rspec have_words_spec.rb"
+     When I run `rspec have_words_spec.rb`
      Then the output should contain "16 examples, 8 failures"
       And the output should contain "expected target not to have 5 words, got 5"
       And the output should contain "expected 4 words, got 5"

data/features/built_in_matchers/include.feature

@@ -47,7 +47,7 @@ Feature: include matcher
         it { should_not include(1, 9) }
       end
       """
-    When I run "rspec array_include_matcher_spec.rb"
+    When I run `rspec array_include_matcher_spec.rb`
     Then the output should contain all of these:
       | 14 examples, 7 failures                       |
       | expected [1, 3, 7] to include 4               |
@@ -74,7 +74,7 @@ Feature: include matcher
         it { should_not include("str", "foo") }
       end
       """
-    When I run "rspec string_include_matcher_spec.rb"
+    When I run `rspec string_include_matcher_spec.rb`
     Then the output should contain all of these:
       | 8 examples, 4 failures                             |
       | expected "a string" to include "foo"               |
@@ -117,5 +117,5 @@ Feature: include matcher
         it { should_not include(:a => 7, :d => 3) }
       end
       """
-    When I run "rspec hash_include_matcher_spec.rb"
+    When I run `rspec hash_include_matcher_spec.rb`
     Then the output should contain "13 failure"

data/features/built_in_matchers/match.feature

@@ -24,7 +24,7 @@ Feature: match matcher
         it { should match(/foo/) }
       end
       """
-    When I run "rspec string_match_spec.rb"
+    When I run `rspec string_match_spec.rb`
     Then the output should contain all of these:
       | 4 examples, 2 failures                 |
       | expected "a string" not to match /str/ |
@@ -42,7 +42,7 @@ Feature: match matcher
         it { should match("drinks") }
       end
       """
-    When I run "rspec regexp_match_spec.rb"
+    When I run `rspec regexp_match_spec.rb`
     Then the output should contain all of these:
       | 4 examples, 2 failures             |
       | expected /foo/ not to match "food" |

data/features/built_in_matchers/operators.feature

@@ -46,7 +46,7 @@ Feature: operator matchers
         it { should_not == 18 }
       end
       """
-     When I run "rspec numeric_operator_matchers_spec.rb"
+     When I run `rspec numeric_operator_matchers_spec.rb`
      Then the output should contain "12 examples, 6 failures"
       And the output should contain:
       """
@@ -119,7 +119,7 @@ Feature: operator matchers
         end
       end
       """
-     When I run "rspec string_operator_matchers_spec.rb"
+     When I run `rspec string_operator_matchers_spec.rb`
      Then the output should contain "18 examples, 9 failures"
       And the output should contain:
       """
@@ -196,7 +196,7 @@ Feature: operator matchers
         it { should =~ [1, 2, 1] }
       end
       """
-     When I run "rspec array_operator_matchers_spec.rb"
+     When I run `rspec array_operator_matchers_spec.rb`
      Then the output should contain "11 examples, 3 failures"
       And the output should contain:
       """

data/features/built_in_matchers/predicates.feature

@@ -46,7 +46,7 @@ Feature: predicate matchers
         it { should be_zero } # deliberate failure
       end
       """
-    When I run "rspec should_be_zero_spec.rb"
+    When I run `rspec should_be_zero_spec.rb`
     Then the output should contain "2 examples, 1 failure"
      And the output should contain "expected zero? to return true, got false"
 
@@ -61,7 +61,7 @@ Feature: predicate matchers
         it { should_not be_empty } # deliberate failure
       end
       """
-    When I run "rspec should_not_be_empty_spec.rb"
+    When I run `rspec should_not_be_empty_spec.rb`
     Then the output should contain "2 examples, 1 failure"
      And the output should contain "expected empty? to return false, got true"
 
@@ -74,7 +74,7 @@ Feature: predicate matchers
         it { should have_key(:bar) } # deliberate failure
       end
       """
-    When I run "rspec should_have_key_spec.rb"
+    When I run `rspec should_have_key_spec.rb`
     Then the output should contain "2 examples, 1 failure"
      And the output should contain "expected #has_key?(:bar) to return true, got false"
 
@@ -99,7 +99,7 @@ Feature: predicate matchers
          end
        end
        """
-     When I run "rspec should_not_have_all_string_keys_spec.rb"
+     When I run `rspec should_not_have_all_string_keys_spec.rb`
      Then the output should contain "2 examples, 1 failure"
       And the output should contain "expected #has_all_string_keys?(nil) to return false, got true"
 
@@ -121,7 +121,7 @@ Feature: predicate matchers
          it { should be_multiple_of(5) }
        end
        """
-     When I run "rspec predicate_matcher_argument_spec.rb"
+     When I run `rspec predicate_matcher_argument_spec.rb`
      Then the output should contain "4 examples, 2 failures"
       And the output should contain "expected multiple_of?(4) to return false, got true"
       And the output should contain "expected multiple_of?(5) to return true, got false"