Fix build failed with rubygem-rspec
This commit is contained in:
parent
134d22f81a
commit
1a1fd5d228
37
rubygem-rspec-its-1.2.0-Bump-to-RSpec-3.9.patch
Normal file
37
rubygem-rspec-its-1.2.0-Bump-to-RSpec-3.9.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 96b8b55805c93ef6eb941af9fc612ce8a23ace07 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
||||||
|
Date: Fri, 7 Feb 2020 12:36:48 +0100
|
||||||
|
Subject: [PATCH] Bump to RSpec 3.9.
|
||||||
|
|
||||||
|
The one test failure was caused by change in RSpec 3.9:
|
||||||
|
|
||||||
|
https://github.com/rspec/rspec-expectations/pull/1080
|
||||||
|
---
|
||||||
|
Gemfile | 2 +-
|
||||||
|
features/its.feature | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff -Nur a/features/its.feature b/features/its.feature
|
||||||
|
--- a/features/its.feature 2022-06-29 16:18:39.419720230 +0800
|
||||||
|
+++ b/features/its.feature 2022-06-29 16:18:13.551300695 +0800
|
||||||
|
@@ -28,7 +28,7 @@
|
||||||
|
Person
|
||||||
|
with one phone number (555-1212)
|
||||||
|
phone_numbers.first
|
||||||
|
- should eq "555-1212"
|
||||||
|
+ is expected to eq "555-1212"
|
||||||
|
"""
|
||||||
|
|
||||||
|
Scenario: specify value of an attribute of a hash
|
||||||
|
diff -Nur a/Gemfile b/Gemfile
|
||||||
|
--- a/Gemfile 2022-06-29 16:18:39.415720165 +0800
|
||||||
|
+++ b/Gemfile 2022-06-29 16:18:13.551300695 +0800
|
||||||
|
@@ -4,7 +4,7 @@
|
||||||
|
gemspec
|
||||||
|
|
||||||
|
%w[rspec rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
|
||||||
|
- branch = ENV.fetch('BRANCH','3-1-maintenance')
|
||||||
|
+ branch = ENV.fetch('BRANCH','3-9-maintenance')
|
||||||
|
library_path = File.expand_path("../../#{lib}", __FILE__)
|
||||||
|
if File.exist?(library_path)
|
||||||
|
gem lib, :path => library_path
|
||||||
@ -1,7 +1,7 @@
|
|||||||
%global gem_name rspec-its
|
%global gem_name rspec-its
|
||||||
Name: rubygem-%{gem_name}
|
Name: rubygem-%{gem_name}
|
||||||
Version: 1.2.0
|
Version: 1.2.0
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Provides "its" method formerly part of rspec-core
|
Summary: Provides "its" method formerly part of rspec-core
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/rspec/rspec-its
|
URL: https://github.com/rspec/rspec-its
|
||||||
@ -9,17 +9,11 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
|||||||
# Fix Ruby 2.4 compatibility
|
# Fix Ruby 2.4 compatibility
|
||||||
# https://github.com/rspec/rspec-its/pull/45
|
# https://github.com/rspec/rspec-its/pull/45
|
||||||
Patch0: rubygem-rspec-its-1.2.0-Fix-Ruby-2.4-compatibility.patch
|
Patch0: rubygem-rspec-its-1.2.0-Fix-Ruby-2.4-compatibility.patch
|
||||||
|
Patch1: rubygem-rspec-its-1.2.0-Bump-to-RSpec-3.9.patch
|
||||||
|
|
||||||
%if 0%{?el7}
|
|
||||||
Requires: ruby(release) ruby(rubygems) rubygem-rspec-core
|
|
||||||
Requires: rubygem(rspec-expectations) >= 2.99.0.beta1
|
|
||||||
%endif
|
|
||||||
BuildRequires: ruby(release) rubygems-devel rubygem-rspec-core rubygem(rspec-expectations)
|
BuildRequires: ruby(release) rubygems-devel rubygem-rspec-core rubygem(rspec-expectations)
|
||||||
BuildRequires: rubygem(aruba)
|
BuildRequires: rubygem(aruba)
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if 0%{?el7}
|
|
||||||
Provides: rubygem(%{gem_name}) = %{version}
|
|
||||||
%endif
|
|
||||||
%description
|
%description
|
||||||
RSpec extension gem for attribute matching.
|
RSpec extension gem for attribute matching.
|
||||||
|
|
||||||
@ -32,6 +26,7 @@ Documentation for %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{gem_name}-%{version}
|
%setup -q -n %{gem_name}-%{version}
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
gem build ../%{gem_name}-%{version}.gemspec
|
gem build ../%{gem_name}-%{version}.gemspec
|
||||||
@ -72,5 +67,8 @@ popd
|
|||||||
%{gem_instdir}/%{gem_name}.gemspec
|
%{gem_instdir}/%{gem_name}.gemspec
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 29 2022 liyanan <liyanan32@h-partners.com> - 1.2.0-2
|
||||||
|
- Fix build failed with rubygem-rspec
|
||||||
|
|
||||||
* Tue Aug 18 2020 xiezheng <xiezheng4@huawei.com> - 1.2.0-1
|
* Tue Aug 18 2020 xiezheng <xiezheng4@huawei.com> - 1.2.0-1
|
||||||
- package init
|
- package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user