Compare commits

..

No commits in common. "c8s" and "c9-beta" have entirely different histories.
c8s ... c9-beta

6 changed files with 76 additions and 78 deletions

30
.gitignore vendored
View File

@ -1,28 +1,2 @@
/rspec-expectations-2.5.0.gem
/rspec-expectations-2.6.0.rc4.gem
/rspec-expectations-2.6.0.rc6.gem
/rspec-expectations-2.6.0.gem
/rspec-expectations-2.8.0.gem
/rspec-expectations-2.11.3.gem
/rspec-expectations-2.12.1.gem
/rspec-expectations-2.13.0.gem
/rspec-expectations-2.14.2.gem
/rspec-expectations-2.14.3.gem
/rspec-expectations-2.14.4.gem
/rspec-expectations-2.14.5.gem
/rspec-expectations-3.1.2.gem
/rubygem-rspec-expectations-3.1.2-full.tar.gz
/rspec-expectations-3.2.0.gem
/rubygem-rspec-expectations-3.2.0-full.tar.gz
/rspec-expectations-3.2.1.gem
/rubygem-rspec-expectations-3.2.1-full.tar.gz
/rspec-expectations-3.3.1.gem
/rubygem-rspec-expectations-3.3.1-full.tar.gz
/rspec-expectations-3.4.0.gem
/rubygem-rspec-expectations-3.4.0-full.tar.gz
/rspec-expectations-3.5.0.gem
/rubygem-rspec-expectations-3.5.0-full.tar.gz
/rspec-expectations-3.6.0.gem
/rubygem-rspec-expectations-3.6.0-full.tar.gz
/rspec-expectations-3.7.0.gem
/rubygem-rspec-expectations-3.7.0-full.tar.gz
SOURCES/rspec-expectations-3.10.1.gem
SOURCES/rubygem-rspec-expectations-3.10.1-full.tar.gz

View File

@ -0,0 +1,2 @@
887d8beda1925b70cfe7835073111e9b0860dc6e SOURCES/rspec-expectations-3.10.1.gem
cb5fd447ba2918276ba7962511d36df5694a89e0 SOURCES/rubygem-rspec-expectations-3.10.1-full.tar.gz

View File

@ -1,9 +1,9 @@
%global majorver 3.7.0
%global majorver 3.10.1
#%%global preminorver .rc6
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
%global fullver %{majorver}%{?preminorver}
%global fedorarel 4
%global fedorarel 1
%global gem_name rspec-expectations
@ -14,25 +14,22 @@
Summary: RSpec expectations (should and matchers)
Name: rubygem-%{gem_name}
Version: %{majorver}
Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}
Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.3
Group: Development/Languages
License: MIT
URL: http://github.com/rspec/rspec-expectations
Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem
# %%{SOURCE2} %%{name} %%{version}
Source1: rubygem-%{gem_name}-%{version}-full.tar.gz
Source2: rspec-related-create-full-tarball.sh
# https://github.com/rspec/rspec-expectations/pull/1037
# https://github.com/rspec/rspec-expectations/commit/5999ad46df4782a3136c4bad0c2353daede2cbbd.patch
Patch1: rspec-expectations-3.7.0-aggregator-ruby25.patch
#BuildRequires: ruby(release)
BuildRequires: rubygems-devel
%if 0%{?need_bootstrap_set} < 1
BuildRequires: rubygem(rspec)
# Some features in expectations needs this
BuildRequires: rubygem(rspec-support) >= 3.9.3
BuildRequires: rubygem(minitest) >= 5
BuildRequires: rubygem(rake)
BuildRequires: git
%endif
BuildArch: noarch
@ -43,7 +40,6 @@ RSpec::Matchers, a library of standard matchers.
%package doc
Summary: Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
%description doc
@ -52,7 +48,6 @@ This package contains documentation for %{name}.
%prep
%setup -q -T -n %{gem_name}-%{version} -b 1
%patch1 -p1
gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec
@ -70,7 +65,7 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts}
%if 0%{?need_bootstrap_set} < 1
%check
LANG=en_US.UTF-8
LANG=C.UTF-8
ruby -rrubygems -Ilib/ -S rspec spec/
%endif
@ -90,8 +85,70 @@ ruby -rrubygems -Ilib/ -S rspec spec/
%{gem_docdir}
%changelog
* Thu Jul 12 2018 Jun Aruga <jaruga@redhat.com> - 3.7.0-4
- Fix FTBFS by adding build dependency for RHEL.
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.10.1-1.3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.10.1-1.2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 29 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.1-1
- 3.10.1
* Fri Dec 11 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.0-1
- Enable tests again
* Fri Dec 11 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.0-0.1
- 3.10.0
- Once disable test for bootstrap
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.2-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat May 9 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.2-1
- 3.9.2
* Sun Apr 19 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.1-1
- 3.9.1
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.0-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Dec 10 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.0-2
- Enable tests again
* Tue Dec 10 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.9.0-0.1
- 3.9.0
- Once disable test for bootstrap
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Jun 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.4-1
- 3.8.4
* Wed Apr 24 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.3-1
- 3.8.3
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.2-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Dec 13 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.2-1
- Enable tests again
* Wed Dec 12 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.8.2-0.1
- 3.8.2
- Once disable test for bootstrap
* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.7.0-3.2
- Use C.UTF-8 locale
See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 14 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.7.0-3
- Backport upstream patch to fix test failure on ruby 25

View File

@ -1,33 +0,0 @@
From 5999ad46df4782a3136c4bad0c2353daede2cbbd Mon Sep 17 00:00:00 2001
From: Myron Marston <myron.marston@gmail.com>
Date: Sat, 30 Dec 2017 17:36:55 -0800
Subject: [PATCH] Disable Ruby 2.5 feature to avoid test failures on 2.5.
---
spec/rspec/expectations/failure_aggregator_spec.rb | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/spec/rspec/expectations/failure_aggregator_spec.rb b/spec/rspec/expectations/failure_aggregator_spec.rb
index 6628aa75..40a1ae35 100644
--- a/spec/rspec/expectations/failure_aggregator_spec.rb
+++ b/spec/rspec/expectations/failure_aggregator_spec.rb
@@ -216,6 +216,19 @@ def expect_error_included_in_aggregated_failure(error)
end
context "when an expectation failure happens in another thread" do
+ # On Ruby 2.5+, the new `report_on_exception` causes the errors in the threads
+ # to print warnings, which our rspec-support test harness converts into a test
+ # failure since we want to enforce warnings-free code. To prevent the warning,
+ # we need to disable the setting here.
+ if Thread.respond_to?(:report_on_exception)
+ around do |example|
+ orig = Thread.report_on_exception
+ Thread.report_on_exception = false
+ example.run
+ Thread.report_on_exception = orig
+ end
+ end
+
it "includes the failure in the failures array if there are other failures" do
expect {
aggregate_failures do

View File

@ -1,2 +0,0 @@
SHA512 (rspec-expectations-3.7.0.gem) = 011575f87fb26ea3dd04ebff30f94c6686f07508c3adfd5b1fe6cde12758bd05773b685e45d4596ccccf860b85de74da14ea80072ac09932aa0ab30e06304a24
SHA512 (rubygem-rspec-expectations-3.7.0-full.tar.gz) = 8c316c899a5f6f165874ba7affc039ef7061a4e002c39757db40b223474ee085403b1e9cc63e26b8b5a3caaf9dd26055a66d7c2263a4f637bf4814c6c9ff593a