Compare commits

...

No commits in common. 'epel9' and 'i9' have entirely different histories.
epel9 ... i9

3
.gitignore vendored

@ -1,3 +0,0 @@
/cucumber-*.gem
/rubygem-cucumber-*-features.txz
/rubygem-cucumber-*-spec.txz

Binary file not shown.

@ -1,11 +1,10 @@
%global gem_name cucumber %global gem_name cucumber
# Enable bootstrap until dependencies are in epel9 %bcond_with bootstrap
%global bootstrap 0
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: 7.1.0 Version: 7.1.0
Release: 3%{?dist}.1 Release: 5%{?dist}
Summary: Tool to execute plain-text documents as functional tests Summary: Tool to execute plain-text documents as functional tests
License: MIT License: MIT
URL: https://cucumber.io/ URL: https://cucumber.io/
@ -19,9 +18,10 @@ Source2: %{name}-%{version}-features.txz
BuildRequires: ruby(release) BuildRequires: ruby(release)
BuildRequires: rubygems-devel BuildRequires: rubygems-devel
BuildRequires: ruby BuildRequires: ruby
# These are for tests, disable until dependencies are in epel9 # Aruba has circular dependency with Cucumber.
%if %{bootstrap} %if %{without bootstrap}
BuildRequires: rubygem(aruba) BuildRequires: rubygem(aruba)
%endif
BuildRequires: rubygem(builder) BuildRequires: rubygem(builder)
BuildRequires: rubygem(cucumber-core) BuildRequires: rubygem(cucumber-core)
BuildRequires: rubygem(cucumber-wire) BuildRequires: rubygem(cucumber-wire)
@ -32,7 +32,6 @@ BuildRequires: rubygem(webrick)
BuildRequires: rubygem(nokogiri) BuildRequires: rubygem(nokogiri)
BuildRequires: rubygem(rspec) BuildRequires: rubygem(rspec)
BuildRequires: rubygem(rake) BuildRequires: rubygem(rake)
%endif
BuildArch: noarch BuildArch: noarch
%description %description
@ -89,8 +88,6 @@ cp -pa .%{_bindir}/* \
find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
%check %check
# Disable tests until dependencies are in epel9
%if %{bootstrap}
pushd .%{gem_instdir} pushd .%{gem_instdir}
# Cucumber.yml is needed for both test suites. # Cucumber.yml is needed for both test suites.
# Used as fixture for rspec and options for cucumber. # Used as fixture for rspec and options for cucumber.
@ -102,6 +99,7 @@ sed -i '/require.*pry/ s/^/#/' spec/spec_helper.rb
rspec -Ilib spec rspec -Ilib spec
%if %{without bootstrap}
ln -s %{_builddir}/features features ln -s %{_builddir}/features features
# Skip the test that requires rubygem-cucumber-html-formatter, # Skip the test that requires rubygem-cucumber-html-formatter,
@ -112,8 +110,8 @@ sed -i -e '/^ Scenario: output html to stdout$/i @skip' \
# Use RUBYOPT to make sure that the Cucumber from current directory has # Use RUBYOPT to make sure that the Cucumber from current directory has
# precedence over system Cucumber, which is pulled in as Aruba dependency. # precedence over system Cucumber, which is pulled in as Aruba dependency.
RUBYOPT=-Ilib cucumber --tags 'not @skip' RUBYOPT=-Ilib cucumber --tags 'not @skip'
popd
%endif %endif
popd
%files %files
%dir %{gem_instdir} %dir %{gem_instdir}
@ -131,8 +129,14 @@ popd
%doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/CHANGELOG.md
%changelog %changelog
* Mon Jun 06 2022 Troy Dawson <tdawson@redhat.com> - 0.13.1-7.1 * Thu Sep 21 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 7.1.0-5
- Disable test dependencies and tests, until they are in epel9 - Rebuilt for MSVSphere 9.2
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Jan 30 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 7.1.0-3 * Sun Jan 30 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 7.1.0-3
- BR: rubygem(rake) due to recent rubygem(rspec-core) dependency change - BR: rubygem(rake) due to recent rubygem(rspec-core) dependency change

@ -1,70 +0,0 @@
From 486e4fe98b93580b63b504579d99c37790f4557d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Rasmusson?= <B.Rasmusson@computer.org>
Date: Mon, 23 Jul 2018 13:35:05 +0200
Subject: [PATCH] Pass the registry to the Wire plugin.
Also, the class StepArgument is only used in the Wire plugin, so move
it to Cucumber-Wire.
---
lib/cucumber/glue/step_definition.rb | 1 -
lib/cucumber/runtime.rb | 2 +-
lib/cucumber/step_argument.rb | 25 --------------------------
3 files changed, 1 insertion(+), 27 deletions(-)
delete mode 100644 lib/cucumber/step_argument.rb
diff --git a/lib/cucumber/glue/step_definition.rb b/lib/cucumber/glue/step_definition.rb
index 81b3630b4..a8f43c0f2 100644
--- a/lib/cucumber/glue/step_definition.rb
+++ b/lib/cucumber/glue/step_definition.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'cucumber/step_match'
-require 'cucumber/step_argument'
require 'cucumber/core_ext/string'
require 'cucumber/glue/invoke_in_world'
diff --git a/lib/cucumber/runtime.rb b/lib/cucumber/runtime.rb
index fa9f88e0d..f60cf64b9 100644
--- a/lib/cucumber/runtime.rb
+++ b/lib/cucumber/runtime.rb
@@ -273,7 +273,7 @@ def load_step_definitions
end
def install_wire_plugin
- Cucumber::Wire::Plugin.new(@configuration).install if @configuration.all_files_to_load.any? { |f| f =~ %r{\.wire$} }
+ Cucumber::Wire::Plugin.new(@configuration, @support_code.registry).install if @configuration.all_files_to_load.any? { |f| f =~ /\.wire$/ }
end
def log
diff --git a/lib/cucumber/step_argument.rb b/lib/cucumber/step_argument.rb
deleted file mode 100644
index c5d0cf076..000000000
--- a/lib/cucumber/step_argument.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Cucumber
- # Defines the location and value of a captured argument from the step
- # text
- class StepArgument
- def self.arguments_from(regexp, step_name)
- match = regexp.match(step_name)
- if match
- n = 0
- match.captures.map do |val|
- n += 1
- offset = match.offset(n)[0]
- new(offset, val)
- end
- end
- end
-
- attr_reader :offset, :val
-
- def initialize(offset, val)
- @offset, @val = offset, val
- end
- end
-end

@ -1,33 +0,0 @@
From 68fae17f1439a3ad29453cf10951bd3b5131fd6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Wed, 27 Feb 2019 15:40:37 +0100
Subject: [PATCH] Respect Ruby configuration when filtering backtrace.
The Ruby might be configured to be installed into various locations. Be
smarter about filtering backtrace to properly remove all traces of
standard library.
Fixes #1341.
---
spec/cucumber/formatter/backtrace_filter_spec.rb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/spec/cucumber/formatter/backtrace_filter_spec.rb b/spec/cucumber/formatter/backtrace_filter_spec.rb
index f51748a5..27563a63 100644
--- a/spec/cucumber/formatter/backtrace_filter_spec.rb
+++ b/spec/cucumber/formatter/backtrace_filter_spec.rb
@@ -14,8 +14,10 @@ module Cucumber
_anything__minitest__anything_
_anything__test/unit__anything_
_anything__Xgem/ruby__anything_
- _anything__lib/ruby/__anything_
_anything__.rbenv/versions/2.3/bin/bundle__anything_)
+ trace << "_anything__#{RbConfig::CONFIG['rubyarchdir']}__anything_"
+ trace << "_anything__#{RbConfig::CONFIG['rubylibdir']}__anything_"
+
@exception = Exception.new
@exception.set_backtrace(trace)
end
--
2.20.1

@ -1,41 +0,0 @@
From 68fae17f1439a3ad29453cf10951bd3b5131fd6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Wed, 27 Feb 2019 15:40:37 +0100
Subject: [PATCH] Respect Ruby configuration when filtering backtrace.
The Ruby might be configured to be installed into various locations. Be
smarter about filtering backtrace to properly remove all traces of
standard library.
Fixes #1341.
---
lib/cucumber/formatter/backtrace_filter.rb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/cucumber/formatter/backtrace_filter.rb b/lib/cucumber/formatter/backtrace_filter.rb
index d0359e34..d58df52a 100644
--- a/lib/cucumber/formatter/backtrace_filter.rb
+++ b/lib/cucumber/formatter/backtrace_filter.rb
@@ -13,15 +13,17 @@ module Cucumber
minitest
test/unit
.gem/ruby
- lib/ruby/
bin/bundle
)
+
+ @backtrace_filters << RbConfig::CONFIG['rubyarchdir']
+ @backtrace_filters << RbConfig::CONFIG['rubylibdir']
if ::Cucumber::JRUBY
@backtrace_filters << 'org/jruby/'
end
- BACKTRACE_FILTER_PATTERNS = Regexp.new(@backtrace_filters.join('|'))
+ BACKTRACE_FILTER_PATTERNS = Regexp.new(@backtrace_filters.compact.join('|'))
class BacktraceFilter
def initialize(exception)
--
2.20.1

@ -1,3 +0,0 @@
SHA512 (cucumber-7.1.0.gem) = 3caa09e3872a72dee619eb29f82e24582b23e81674cf3ff5f53818f6c49b675a74a43755f4d606f2ef18e60037c6f7cf907831045dc4d154f76a629a9d9a6ae9
SHA512 (rubygem-cucumber-7.1.0-spec.txz) = d1ef8caa8afce2ebd890de45fc42ceeb55148f47f04e7c558b0bf0542fd07400f26980e79e17e617678637f0aa257e6c0cea181ed115e19e7d323205241ec863
SHA512 (rubygem-cucumber-7.1.0-features.txz) = cab65b7015afbeb4e5b473f42d82fd294ff8a243399a8bb1d57f20e9ad000a84803c5c9a8c1d2c07291318b897cabf41d5b4ca6d63264e1b2056d75b062c98c5
Loading…
Cancel
Save