From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D605158095 for ; Thu, 28 Jul 2022 08:28:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 656C4E0D23; Thu, 28 Jul 2022 08:28:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A857E0D0D for ; Thu, 28 Jul 2022 08:28:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 783353410FD for ; Thu, 28 Jul 2022 08:28:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7085551 for ; Thu, 28 Jul 2022 08:28:05 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1658996882.7790a24b65251491d8b782b0035b13ca49c75ad6.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/webmock/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/webmock/webmock-3.14.0-r1.ebuild X-VCS-Directories: dev-ruby/webmock/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 7790a24b65251491d8b782b0035b13ca49c75ad6 X-VCS-Branch: master Date: Thu, 28 Jul 2022 08:28:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 11da3442-8843-4079-8b9d-b9b291bbd21b X-Archives-Hash: e1cc133943130676edc7996b396bf7f9 commit: 7790a24b65251491d8b782b0035b13ca49c75ad6 Author: Hans de Graaff gentoo org> AuthorDate: Thu Jul 28 07:43:40 2022 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Thu Jul 28 08:28:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7790a24b dev-ruby/webmock: fix tests Fix tests that now fail due to fixed for kwargs handling in ruby30. Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/webmock/webmock-3.14.0-r1.ebuild | 67 +++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dev-ruby/webmock/webmock-3.14.0-r1.ebuild b/dev-ruby/webmock/webmock-3.14.0-r1.ebuild new file mode 100644 index 000000000000..d5b431fb5dd2 --- /dev/null +++ b/dev-ruby/webmock/webmock-3.14.0-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby27 ruby30" + +RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true" + +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" + +inherit ruby-fakegem + +DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests" +HOMEPAGE="https://github.com/bblimke/webmock" + +LICENSE="GPL-2" +SLOT="3" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="" + +ruby_add_rdepend " + >=dev-ruby/addressable-2.8.0 + >=dev-ruby/crack-0.3.2 + >=dev-ruby/hashdiff-0.4.0:0 +" + +ruby_add_bdepend "test? ( + dev-ruby/minitest:5 + dev-ruby/rspec:3 + >=dev-ruby/test-unit-3.0.0 + dev-ruby/rack +)" + +all_ruby_prepare() { + # Remove bundler support + rm Gemfile || die + sed -i -e '/[Bb]undler/d' Rakefile || die + sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die + sed -i -e '1igem "test-unit"' test/test_helper.rb || die + + # There is now optional support for curb and typhoeus which we don't + # have in Gentoo yet. em_http_request is available in Gentoo but its + # version is too old. patron's latest version is not compatible. + # httpclient is no longer maintained and has various test failures. + sed -i -e '/\(curb\|typhoeus\|em-http\|patron\|httpclient\)/ s:^:#:' spec/spec_helper.rb || die + rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client,httpclient}/* || die + + # Drop tests for dev-ruby/http for now since this package only works with ruby26 + sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die + rm -f spec/acceptance/http_rb/* || die + + # Avoid specs that require network access + sed -i -e '/when request is not stubbed/,/^ end/ s:^:#:' spec/acceptance/shared/callbacks.rb + + # Fix specs with kwargs confusion on ruby30 + sed -i -e "21 s/'A' => 'a'/{'A' => 'a'}/" spec/unit/request_signature_spec.rb || die + sed -i -e "34 s/'A' => 'a'/{'A' => 'a'}/" spec/unit/response_spec.rb || die +} + +each_ruby_test() { + ${RUBY} -S rake test NO_CONNECTION=true || die + ${RUBY} -S rspec-3 spec || die + + einfo "Delay to allow the test server to stop" + sleep 10 +}