[DRE-commits] [SCM] ruby-rspec-expectations.git branch, master, updated. debian/2.10.0-2-13-gf341508

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 35d475d74d805bf94d6ad335814d56002f61ea3e
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue Mar 26 09:51:20 2013 +0000

    Drop patches included in new upstream version

diff --git a/debian/patches/apply_upstream_fix_to_failing_test_with_ruby18.patch b/debian/patches/apply_upstream_fix_to_failing_test_with_ruby18.patch
deleted file mode 100644
index 0c55a05..0000000
--- a/debian/patches/apply_upstream_fix_to_failing_test_with_ruby18.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fix failing spec/rspec/matchers/yield_spec with Ruby1.8
- The test on line 294 was relying on the order of a Hash, which is not granted
- with Ruby1.8.
- This patch makes the test use an array of tuples instead.
-
-Author: Myron Marston <myron.marston at gmail.com>
-Origin: commit:https://github.com/rspec/rspec-expectations/commit/3cf9110be5e4b0682a074b7dbfc35fd0bae4c639
-Bug: https://github.com/rspec/rspec-expectations/issues/144
-Last-Update: 2012-05-10
----
- spec/rspec/matchers/yield_spec.rb |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/spec/rspec/matchers/yield_spec.rb
-+++ b/spec/rspec/matchers/yield_spec.rb
-@@ -291,18 +291,18 @@
- 
-   describe "expect {...}.to yield_successive_args([:a, 1], [:b, 2])" do
-     it 'passes when the block successively yields the given args' do
--      expect { |b| { :a => 1, :b => 2 }.each(&b) }.to yield_successive_args([:a, 1], [:b, 2])
-+      expect { |b| [ [:a, 1], [:b, 2] ].each(&b) }.to yield_successive_args([:a, 1], [:b, 2])
-     end
- 
-     it 'fails when the block does not yield that many times' do
-       expect {
--        expect { |b| { :a => 1 }.each(&b) }.to yield_successive_args([:a, 1], [:b, 2])
-+        expect { |b| [[:a, 1]].each(&b) }.to yield_successive_args([:a, 1], [:b, 2])
-       }.to fail_with(/but yielded with unexpected arguments/)
-     end
- 
-     it 'fails when the block yields the right number of times but with different arguments' do
-       expect {
--        expect { |b| { :a => 1, :b => 3 }.each(&b) }.to yield_successive_args([:a, 1], [:b, 2])
-+        expect { |b| [ [:a, 1], [:b, 3] ].each(&b) }.to yield_successive_args([:a, 1], [:b, 2])
-       }.to fail_with(/but yielded with unexpected arguments/)
-     end
-   end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fbdd50f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-apply_upstream_fix_to_failing_test_with_ruby18.patch

-- 
ruby-rspec-expectations.git