[DRE-commits] [SCM] ruby-rspec-expectations.git branch, master, updated. upstream/2.8.0-17-g0ea84a4

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 2c7f2b305a5f5aa1a7016b15936866920d624f62
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri May 11 11:53:40 2012 +0200

    remove deactivate_random_order_from_spec_helper.patch, add apply_upstream_fix_to_failing_test_with_ruby18.patch

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
new file mode 100644
index 0000000..0c55a05
--- /dev/null
+++ b/debian/patches/apply_upstream_fix_to_failing_test_with_ruby18.patch
@@ -0,0 +1,37 @@
+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/deactivate_random_order_from_spec_helper.patch b/debian/patches/deactivate_random_order_from_spec_helper.patch
deleted file mode 100644
index 86b634a..0000000
--- a/debian/patches/deactivate_random_order_from_spec_helper.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Deactivate random order for specs in spec_helper.rb
- The order functionality is not available in ruby-rspec-core 2.5, which will be
- the one available to build ruby-rspec-expectations. The possibility to run the
- specs in a random order has thus to be temporarily deactivated.
-Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Forwarded: not-needed
-Last-Update: 2012-02-13
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -23,5 +23,4 @@
-   config.color_enabled = true
-   config.filter_run :focused => true
-   config.run_all_when_everything_filtered = true
--  config.order = :random
- end
diff --git a/debian/patches/series b/debian/patches/series
index 282f36b..fbdd50f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-deactivate_random_order_from_spec_helper.patch
+apply_upstream_fix_to_failing_test_with_ruby18.patch

-- 
ruby-rspec-expectations.git