Fix FTBFS caused by latest RSpec.

f38
Vít Ondruch 3 years ago
parent 03f389a7bb
commit 6578a4f841

@ -0,0 +1,36 @@
From fb8bf400e5a1e56f66318b6ea5a8b64894b05596 Mon Sep 17 00:00:00 2001
From: ojab <ojab@ojab.ru>
Date: Thu, 10 Feb 2022 14:32:49 +0000
Subject: [PATCH] Fixup failures with latest RSpec
---
spec/unit/request_signature_spec.rb | 2 +-
spec/unit/response_spec.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/spec/unit/request_signature_spec.rb b/spec/unit/request_signature_spec.rb
index 8b9e1990..02a5ec17 100644
--- a/spec/unit/request_signature_spec.rb
+++ b/spec/unit/request_signature_spec.rb
@@ -18,7 +18,7 @@
end
it "assigns normalized headers" do
- expect(WebMock::Util::Headers).to receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
+ allow(WebMock::Util::Headers).to receive(:normalize_headers).with({'A' => 'a'}.freeze).and_return('B' => 'b')
expect(
WebMock::RequestSignature.new(:get, "www.example.com", headers: {'A' => 'a'}).headers
).to eq({'B' => 'b'})
diff --git a/spec/unit/response_spec.rb b/spec/unit/response_spec.rb
index f02cb7c1..4c3ae38d 100644
--- a/spec/unit/response_spec.rb
+++ b/spec/unit/response_spec.rb
@@ -31,7 +31,7 @@
end
it "should report normalized headers" do
- expect(WebMock::Util::Headers).to receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
+ allow(WebMock::Util::Headers).to receive(:normalize_headers).with({'A' => 'a'}.freeze).and_return('B' => 'b')
@response = WebMock::Response.new(headers: {'A' => 'a'})
expect(@response.headers).to eq({'B' => 'b'})
end

@ -3,11 +3,15 @@
Name: rubygem-%{gem_name}
Version: 3.11.1
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Library for stubbing HTTP requests in Ruby
License: MIT
URL: http://github.com/bblimke/webmock
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# Latest RSpec distinguish between hash and kwargs.
# https://github.com/rspec/rspec-mocks/issues/1460
# https://github.com/bblimke/webmock/pull/965/commits/fb8bf400e5a1e56f66318b6ea5a8b64894b05596
Patch0: rubygem-webmock-3.14.0-Fixup-failures-with-latest-RSpec.patch
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: ruby
@ -42,6 +46,8 @@ Documentation for %{name}.
%prep
%setup -q -n %{gem_name}-%{version}
%patch0 -p1
%build
gem build ../%{gem_name}-%{version}.gemspec
%gem_install
@ -85,6 +91,9 @@ popd
%{gem_instdir}/webmock.gemspec
%changelog
* Tue Mar 01 2022 Vít Ondruch <vondruch@redhat.com> - 3.11.1-5
- Fix FTBFS caused by latest RSpec.
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Loading…
Cancel
Save