[gentoo-commits] repo/gentoo:master commit in: dev-ruby/webmock/

[Hans de Graaff]

commit:     379555221e48c1def68ed636fdae6a19284d9c49
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 07:30:58 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 08:14:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37955522

dev-ruby/webmock: fix tests

Package-Manager: portage-2.2.28

 dev-ruby/webmock/webmock-1.19.0.ebuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/webmock/webmock-1.19.0.ebuild 
b/dev-ruby/webmock/webmock-1.19.0.ebuild
index 9ddac19..6566a3f 100644
--- a/dev-ruby/webmock/webmock-1.19.0.ebuild
+++ b/dev-ruby/webmock/webmock-1.19.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 USE_RUBY="ruby20"
 
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+RUBY_FAKEGEM_TASK_TEST="test NO_CONNECTION=true"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -28,7 +28,7 @@ ruby_add_bdepend "test? (
        >=dev-ruby/httpclient-2.2.4
        )"
 
-ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.18 >=dev-ruby/http-0.5.0 )"
+ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.18 >=dev-ruby/http-0.5.0:0.6 )"
 
 all_ruby_prepare() {
        # Remove bundler support
@@ -40,11 +40,18 @@ all_ruby_prepare() {
        # version is too old.
        sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
        rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
+       sed -i -e '2i gem "http", "~>0.6.0"' 
spec/acceptance/http_gem/http_gem_spec.rb || die
+
+       # Avoid test failing with newer httpclient versions
+       sed -i -e '/when a client instance is re-used for another identical 
request/,/^  end/ s:^:#:' \
+               spec/acceptance/httpclient/httpclient_spec.rb
 }
 
 each_ruby_test() {
        each_fakegem_test
 
+       NO_CONNECTION=true ruby-ng_rspec
+
        einfo "Delay to allow the test server to stop"
        sleep 10
 }