Compare commits

...

No commits in common. "c10s" and "c8s" have entirely different histories.
c10s ... c8s

4 changed files with 82 additions and 159 deletions

30
.gitignore vendored
View File

@ -1,2 +1,28 @@
/rspec-expectations-*.gem /rspec-expectations-2.5.0.gem
/rubygem-rspec-expectations-*-full.tar.gz /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

View File

@ -0,0 +1,33 @@
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,41 +1,38 @@
%global majorver 3.13.0 %global majorver 3.7.0
#%%global preminorver .rc6 #%%global preminorver .rc6
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
%global fullver %{majorver}%{?preminorver} %global fullver %{majorver}%{?preminorver}
%global baserelease 3 %global fedorarel 4
%global gem_name rspec-expectations %global gem_name rspec-expectations
%bcond_with bootstrap %global need_bootstrap_set 0
%undefine __brp_mangle_shebangs %undefine __brp_mangle_shebangs
Summary: RSpec expectations (should and matchers) Summary: RSpec expectations (should and matchers)
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: %{majorver} Version: %{majorver}
Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}
# SPDX confirmed Group: Development/Languages
License: MIT License: MIT
URL: http://github.com/rspec/rspec-expectations URL: http://github.com/rspec/rspec-expectations
Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem
# %%{SOURCE2} %%{name} %%{version} # %%{SOURCE2} %%{name} %%{version}
Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source1: rubygem-%{gem_name}-%{version}-full.tar.gz
Source2: rspec-related-create-full-tarball.sh 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: ruby(release)
BuildRequires: rubygems-devel BuildRequires: rubygems-devel
%if %{without bootstrap} %if 0%{?need_bootstrap_set} < 1
BuildRequires: rubygem(rspec) BuildRequires: rubygem(rspec)
BuildRequires: rubygem(rake)
# Some features in expectations needs this
BuildRequires: rubygem(rspec-support) >= 3.9.3
BuildRequires: rubygem(minitest) >= 5 BuildRequires: rubygem(minitest) >= 5
%if ! 0%{?rhel} BuildRequires: rubygem(rake)
BuildRequires: rubygem(aruba)
BuildRequires: rubygem(cucumber)
%endif
BuildRequires: git BuildRequires: git
%endif %endif
BuildArch: noarch BuildArch: noarch
@ -46,6 +43,7 @@ RSpec::Matchers, a library of standard matchers.
%package doc %package doc
Summary: Documentation for %{name} Summary: Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description doc %description doc
@ -54,6 +52,7 @@ This package contains documentation for %{name}.
%prep %prep
%setup -q -T -n %{gem_name}-%{version} -b 1 %setup -q -T -n %{gem_name}-%{version} -b 1
%patch1 -p1
gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec
@ -69,30 +68,12 @@ cp -a .%{gem_dir}/* \
# cleanups # cleanups
rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts}
%if 0%{?need_bootstrap_set} < 1
%check %check
%if %{with bootstrap} LANG=en_US.UTF-8
# Skip test, exiting ruby -rrubygems -Ilib/ -S rspec spec/
exit 0
%endif %endif
LANG=C.UTF-8
export RUBYLIB=$(pwd)/lib
rspec spec/
%if 0%{?rhel}
# Skip cucumber test
exit 0
%endif
# Skip one failing scenario, needs investigating...
sed -i features/built_in_matchers/include.feature -e '\@skip-on-fedora@d'
sed -i features/built_in_matchers/include.feature -e 's|^\([ \t]*\)\(Scenario: counts usage.*\)|\1@skip-on-fedora\n\1\2|'
export CUCUMBER_PUBLISH_QUIET=true
cucumber \
--tag "not @skip-when-diff-lcs-1.3" \
--tag "not @skip-on-fedora" \
%{nil}
%files %files
%dir %{gem_instdir} %dir %{gem_instdir}
@ -109,125 +90,8 @@ cucumber \
%{gem_docdir} %{gem_docdir}
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.13.0-3 * Thu Jul 12 2018 Jun Aruga <jaruga@redhat.com> - 3.7.0-4
- Bump release for October 2024 mass rebuild: - Fix FTBFS by adding build dependency for RHEL.
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.13.0-2
- Bump release for June 2024 mass rebuild
* Fri Feb 09 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.0-1
- 3.13.0
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Aug 06 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.3-4
- Remove unneeded conditionals for new MiniTest support
* Fri Aug 4 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.3-3
- Support MiniTest 5.19+
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Apr 21 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.3-1
- 3.12.3
* Fri Mar 10 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 3.12.2-2
- Disable unwanted dependencies in RHEL builds
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Jan 17 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.2-1
- 3.12.2
* Wed Dec 21 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.1-1
- 3.12.1
* Thu Oct 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.0-1
- 3.12.0
* Thu Sep 15 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.11.1-1
- 3.11.1
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.0-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Feb 10 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.11.0-1
- 3.11.0
* Sun Jan 30 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.2-2
- BR: rubygem(rake) for check
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.2-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jan 18 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.10.2-1
- 3.10.2
- Execute cucumber test
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1-1.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* 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 * Wed Feb 14 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.7.0-3
- Backport upstream patch to fix test failure on ruby 25 - Backport upstream patch to fix test failure on ruby 25
@ -334,7 +198,7 @@ cucumber \
- 2.14.4 - 2.14.4
* Fri Sep 27 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.14.3-1 * Fri Sep 27 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.14.3-1
- 2.14.3 - 2.14.3
* Fri Aug 16 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.14.2-2 * Fri Aug 16 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.14.2-2
- Enable test suite again - Enable test suite again

View File

@ -1,2 +1,2 @@
SHA512 (rspec-expectations-3.13.0.gem) = 926f6d54df2258f45ba53f8be90cb5af8a6b74634288ef82a511690ba27614bc283c4e262889e80469c8b48c2c770310402b17f1dd7bca28a24624c4a7d47de2 SHA512 (rspec-expectations-3.7.0.gem) = 011575f87fb26ea3dd04ebff30f94c6686f07508c3adfd5b1fe6cde12758bd05773b685e45d4596ccccf860b85de74da14ea80072ac09932aa0ab30e06304a24
SHA512 (rubygem-rspec-expectations-3.13.0-full.tar.gz) = 4623b5f2e539f42e0d19a64234731fdd288cf9888500e32a54f383e261cdc06f7619bf2d98b11c31e88a3ed0bf3f3d180000d2b9c02e179464c705cb641a58f6 SHA512 (rubygem-rspec-expectations-3.7.0-full.tar.gz) = 8c316c899a5f6f165874ba7affc039ef7061a4e002c39757db40b223474ee085403b1e9cc63e26b8b5a3caaf9dd26055a66d7c2263a4f637bf4814c6c9ff593a