[DRE-commits] [ruby-redis-namespace] 01/03: Fix rspec3-port patch
Balasankar C
balasankarc-guest at moszumanska.debian.org
Mon Dec 21 07:40:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
balasankarc-guest pushed a commit to branch master
in repository ruby-redis-namespace.
commit 64afc037ff6e949f7e34a0a68bc54e967f67dc8f
Author: Balasankar C <balasankarc at autistici.org>
Date: Mon Dec 21 13:09:18 2015 +0530
Fix rspec3-port patch
---
debian/patches/fix-tests-support-rspec3 | 36 ++++++++++++++++-----------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/debian/patches/fix-tests-support-rspec3 b/debian/patches/fix-tests-support-rspec3
index f44d6a8..7d35fd5 100644
--- a/debian/patches/fix-tests-support-rspec3
+++ b/debian/patches/fix-tests-support-rspec3
@@ -693,14 +693,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
it 'should retrieve the proper keys' do
_, results = @namespaced.hscan('hsh', 0, :match => 'zeta:*')
- results.should =~ hash_matching_subset.to_a
-+ expect(results).to match(hash_matching_subset.to_a)
++ expect(results).to match_array(hash_matching_subset.to_a)
end
end
context 'without :match supplied' do
it 'should retrieve all hash keys' do
_, results = @namespaced.hscan('hsh', 0)
- results.should =~ @redis.hgetall('ns:hsh').to_a
-+ expect(results).to match(@redis.hgetall('ns:hsh').to_a)
++ expect(results).to match_array(@redis.hgetall('ns:hsh').to_a)
end
end
end if Redis.current.respond_to?(:hscan)
@@ -709,14 +709,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
results = []
@namespaced.hscan_each('hsh', :match => 'zeta:*', :count => 1000) { |kv| results << kv}
- results.should =~ hash_matching_subset.to_a
-+ expect(results).to match(hash_matching_subset.to_a)
++ expect(results).to match_array(hash_matching_subset.to_a)
end
end
context 'without a block' do
it 'should return an Enumerator that yields the correct hash keys unchanged' do
enum = @namespaced.hscan_each('hsh', :match => 'zeta:*', :count => 1000)
- enum.to_a.should =~ hash_matching_subset.to_a
-+ expect(enum.to_a).to match(hash_matching_subset.to_a)
++ expect(enum.to_a).to match_array(hash_matching_subset.to_a)
end
end
end
@@ -725,14 +725,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
results = []
@namespaced.hscan_each('hsh', :count => 1000){ |k| results << k }
- results.should =~ hash.to_a
-+ expect(results).to match(hash.to_a)
++ expect(results).to match_array(hash.to_a)
end
end
context 'without a block' do
it 'should return an Enumerator that yields all keys unchanged' do
enum = @namespaced.hscan_each('hsh', :count => 1000)
- enum.to_a.should =~ hash.to_a
-+ expect(enum.to_a).to match(hash.to_a)
++ expect(enum.to_a).to match_array(hash.to_a)
end
end
end
@@ -741,14 +741,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
it 'should retrieve the matching set members from the proper set' do
_, results = @namespaced.sscan('set', 0, :match => 'zeta:*', :count => 1000)
- results.should =~ matching_subset
-+ expect(results).to match(matching_subset)
++ expect(results).to match_array(matching_subset)
end
end
context 'without :match supplied' do
it 'should retrieve all set members from the proper set' do
_, results = @namespaced.sscan('set', 0, :count => 1000)
- results.should =~ set
-+ expect(results).to match(set)
++ expect(results).to match_array(set)
end
end
end if Redis.current.respond_to?(:sscan)
@@ -757,14 +757,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
results = []
@namespaced.sscan_each('set', :match => 'zeta:*', :count => 1000) { |kv| results << kv}
- results.should =~ matching_subset
-+ expect(results).to match(matching_subset)
++ expect(results).to match_array(matching_subset)
end
end
context 'without a block' do
it 'should return an Enumerator that yields the correct set elements unchanged' do
enum = @namespaced.sscan_each('set', :match => 'zeta:*', :count => 1000)
- enum.to_a.should =~ matching_subset
-+ expect(enum.to_a).to match(matching_subset)
++ expect(enum.to_a).to match_array(matching_subset)
end
end
end
@@ -773,14 +773,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
results = []
@namespaced.sscan_each('set', :count => 1000){ |k| results << k }
- results.should =~ set
-+ expect(results).to match(set)
++ expect(results).to match_array(set)
end
end
context 'without a block' do
it 'should return an Enumerator that yields all set elements unchanged' do
enum = @namespaced.sscan_each('set', :count => 1000)
- enum.to_a.should =~ set
-+ expect(enum.to_a).to match(set)
++ expect(enum.to_a).to match_array(set)
end
end
end
@@ -789,7 +789,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
results = []
@namespaced.zscan_each('zset', :match => 'zeta:*', :count => 1000) { |ms| results << ms }
- results.should =~ hash_matching_subset.to_a
-+ expect(results).to match(hash_matching_subset.to_a)
++ expect(results).to match_array(hash_matching_subset.to_a)
end
end
context 'without :match supplied' do
@@ -797,7 +797,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
results = []
@namespaced.zscan_each('zset', :count => 1000) { |ms| results << ms }
- results.should =~ hash.to_a
-+ expect(results).to match(hash.to_a)
++ expect(results).to match_array(hash.to_a)
end
end
end if Redis.current.respond_to?(:zscan)
@@ -806,14 +806,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
results = []
@namespaced.zscan_each('zset', :match => 'zeta:*', :count => 1000) { |ms| results << ms}
- results.should =~ hash_matching_subset.to_a
-+ expect(results).to match(hash_matching_subset.to_a)
++ expect(results).to match_array(hash_matching_subset.to_a)
end
end
context 'without a block' do
it 'should return an Enumerator that yields the correct set elements and scoresunchanged' do
enum = @namespaced.zscan_each('zset', :match => 'zeta:*', :count => 1000)
- enum.to_a.should =~ hash_matching_subset.to_a
-+ expect(enum.to_a).to match(hash_matching_subset.to_a)
++ expect(enum.to_a).to match_array(hash_matching_subset.to_a)
end
end
end
@@ -822,14 +822,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
results = []
@namespaced.zscan_each('zset', :count => 1000){ |ms| results << ms }
- results.should =~ hash.to_a
-+ expect(results).to match(hash.to_a)
++ expect(results).to match_array(hash.to_a)
end
end
context 'without a block' do
it 'should return an Enumerator that yields all set elements and scores unchanged' do
enum = @namespaced.zscan_each('zset', :count => 1000)
- enum.to_a.should =~ hash.to_a
-+ expect(enum.to_a).to match(hash.to_a)
++ expect(enum.to_a).to match_array(hash.to_a)
end
end
end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-redis-namespace.git
More information about the Pkg-ruby-extras-commits
mailing list