Compare commits
19 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a15dbce6d2 | ||
|
|
0f8a25e69c | ||
|
|
72a6bf7bf1 | ||
|
|
c9f30db5b6 | ||
|
|
a4d13598b6 | ||
|
|
c656b3f675 | ||
|
|
8f3db82877 | ||
|
|
9d5514744d | ||
|
|
2588a28886 | ||
|
|
9388d9646b | ||
|
|
eb630ff887 | ||
|
|
a624ae482a | ||
|
|
538b3d2602 | ||
|
|
d10ed68b35 | ||
|
|
835dd91fa4 | ||
|
|
a038b38933 | ||
|
|
99d8062c61 | ||
|
|
d096ea30df | ||
|
|
db54bf3ba7 |
4 changed files with 108 additions and 24 deletions
|
|
@ -1,8 +1,10 @@
|
||||||
--- aruba-2.0.0/lib/aruba/api/bundler.rb.make_optional 2021-07-27 04:28:08.000000000 +0900
|
--- aruba-2.0.0/lib/aruba/api/bundler.rb.make_optional 2021-07-27 04:28:08.000000000 +0900
|
||||||
+++ aruba-2.0.0/lib/aruba/api/bundler.rb 2022-01-14 14:40:50.369324292 +0900
|
+++ aruba-2.0.0/lib/aruba/api/bundler.rb 2022-01-14 14:40:50.369324292 +0900
|
||||||
@@ -1,5 +1,4 @@
|
@@ -1,7 +1,6 @@
|
||||||
require "aruba/api/environment"
|
# frozen_string_literal: true
|
||||||
-require "bundler"
|
|
||||||
|
require 'aruba/api/environment'
|
||||||
|
-require 'bundler'
|
||||||
|
|
||||||
module Aruba
|
module Aruba
|
||||||
module Api
|
module Api
|
||||||
|
|
|
||||||
42
rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch
Normal file
42
rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
From bd2aea600f7e989e4da734c3e823c3ce12ce629b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matijs van Zuijlen <matijs@matijs.net>
|
||||||
|
Date: Sun, 6 Apr 2025 23:32:36 +0200
|
||||||
|
Subject: [PATCH] Update expected diff output to match changes in diff-lcs
|
||||||
|
|
||||||
|
Version 1.6.0 of diff-lcs included a bug fix that corrects the hunk
|
||||||
|
ranges it outputs. This change bumps the minimum version of diff-lcs to
|
||||||
|
1.6.0 so this change is sure to be included, and updates the
|
||||||
|
expectations in the cucumber scenarios that depend on exact diff-lcs
|
||||||
|
output.
|
||||||
|
---
|
||||||
|
aruba.gemspec | 1 +
|
||||||
|
.../cucumber/steps/command/check_output_of_command.feature | 2 +-
|
||||||
|
.../cucumber/steps/command/check_stderr_of_command.feature | 2 +-
|
||||||
|
3 files changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature b/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature
|
||||||
|
index 3266514b..1f0d1997 100644
|
||||||
|
--- a/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature
|
||||||
|
+++ b/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature
|
||||||
|
@@ -353,7 +353,7 @@ Feature: All output of commands which were executed
|
||||||
|
world" to output string is eq: "hello
|
||||||
|
worl"
|
||||||
|
Diff:
|
||||||
|
- @@ -1,3 +1,3 @@
|
||||||
|
+ @@ -1,2 +1,2 @@
|
||||||
|
hello
|
||||||
|
-worl
|
||||||
|
+world
|
||||||
|
diff --git a/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature b/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature
|
||||||
|
index cc0e7aad..d3b4c9a9 100644
|
||||||
|
--- a/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature
|
||||||
|
+++ b/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature
|
||||||
|
@@ -82,7 +82,7 @@ Feature: STDERR of commands which were executed
|
||||||
|
expected "hello
|
||||||
|
world!" to output string is eq: ""
|
||||||
|
Diff:
|
||||||
|
- @@ -1,2 +1,4 @@
|
||||||
|
+ @@ -0,0 +1,2 @@
|
||||||
|
+hello
|
||||||
|
+world!
|
||||||
|
"""
|
||||||
|
|
@ -3,19 +3,23 @@
|
||||||
|
|
||||||
Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba
|
Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba
|
||||||
Name: rubygem-%{gem_name}
|
Name: rubygem-%{gem_name}
|
||||||
Version: 2.2.0
|
Version: 2.3.3
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# SPDX confirmed
|
# SPDX confirmed
|
||||||
# templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above
|
# templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://github.com/cucumber/aruba
|
URL: https://github.com/cucumber/aruba
|
||||||
Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
|
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
||||||
Source1: %{name}-%{version}-testsuite.tar.gz
|
Source1: %{name}-%{version}-testsuite.tar.gz
|
||||||
# Source1 is created by $ bash %%SOURCE2 %%VERSION
|
# Source1 is created by $ bash %%SOURCE2 %%VERSION
|
||||||
Source2: %{gem_name}-create-test-suite-tarball.sh
|
Source2: %{gem_name}-create-test-suite-tarball.sh
|
||||||
# Make bundler runtime dependency optional
|
# Make bundler runtime dependency optional
|
||||||
Patch1: rubygem-aruba-2.0.0-make-bundler-optional.patch
|
Patch1: rubygem-aruba-2.0.0-make-bundler-optional.patch
|
||||||
|
# https://github.com/cucumber/aruba/commit/bd2aea600f7e989e4da734c3e823c3ce12ce629b
|
||||||
|
# We still use diff-lcs 1.5, revert the above patch for now
|
||||||
|
Patch2: rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: ruby(release)
|
BuildRequires: ruby(release)
|
||||||
BuildRequires: rubygems-devel
|
BuildRequires: rubygems-devel
|
||||||
|
|
@ -26,11 +30,9 @@ BuildRequires: rubygem(contracts)
|
||||||
BuildRequires: rubygem(cucumber)
|
BuildRequires: rubygem(cucumber)
|
||||||
BuildRequires: rubygem(irb)
|
BuildRequires: rubygem(irb)
|
||||||
BuildRequires: rubygem(minitest)
|
BuildRequires: rubygem(minitest)
|
||||||
BuildRequires: rubygem(pry)
|
|
||||||
BuildRequires: rubygem(rspec) >= 3
|
BuildRequires: rubygem(rspec) >= 3
|
||||||
BuildRequires: rubygem(thor)
|
BuildRequires: rubygem(thor)
|
||||||
# features/steps/command/shell.feature:97 # Scenario: Running python commands
|
BuildRequires: less
|
||||||
BuildRequires: /usr/bin/python3
|
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
|
@ -60,6 +62,7 @@ done
|
||||||
ln -sf ../lib
|
ln -sf ../lib
|
||||||
popd
|
popd
|
||||||
%patch -P1 -p1
|
%patch -P1 -p1
|
||||||
|
%patch -P2 -p1 -R
|
||||||
|
|
||||||
mv ../%{gem_name}-%{version}.gemspec .
|
mv ../%{gem_name}-%{version}.gemspec .
|
||||||
|
|
||||||
|
|
@ -110,17 +113,10 @@ sed -i features/support/env.rb \
|
||||||
sed -i fixtures/cli-app/spec/spec_helper.rb \
|
sed -i fixtures/cli-app/spec/spec_helper.rb \
|
||||||
-e "\@\$LOAD_PATH@s|\.\./\.\./lib|$(pwd)/lib|"
|
-e "\@\$LOAD_PATH@s|\.\./\.\./lib|$(pwd)/lib|"
|
||||||
|
|
||||||
# /usr/bin/python is reporting deprecation warning :/
|
# Kill tests which requires python explicitly
|
||||||
# No need to modify @requires-python (in run_commands.feature and hooks.rb)
|
# (to reduce BR, anyway this test is not important)
|
||||||
if ! grep -q python3 features/steps/command/shell.feature
|
sed -i features/step_definitions/hooks.rb \
|
||||||
then
|
-e '\@platform.which@s|"python"|"no-python"|'
|
||||||
sed -i features/03_testing_frameworks/cucumber/steps/command/run_commands_which_require_a_shell.feature \
|
|
||||||
-e 's|python|python3|'
|
|
||||||
sed -i lib/aruba/generators/script_file.rb \
|
|
||||||
-e '\@interpreter@s|A-Z|A-Z0-9|'
|
|
||||||
sed -i features/01_getting_started_with_aruba/run_commands.feature \
|
|
||||||
-e '\@[^-]python@s|python|python3|'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# The following test fails on ppc64le, due to different block size
|
# The following test fails on ppc64le, due to different block size
|
||||||
# (expected: 64k actual: 4k), disabling
|
# (expected: 64k actual: 4k), disabling
|
||||||
|
|
@ -141,8 +137,8 @@ sed -i features/02_configure_aruba/home_directory.feature \
|
||||||
-e "\@Set to aruba's working directory@,\@Scenario@s|/home/|$(echo $HOME)/|"
|
-e "\@Set to aruba's working directory@,\@Scenario@s|/home/|$(echo $HOME)/|"
|
||||||
|
|
||||||
# Make the Aruba always awailable.
|
# Make the Aruba always awailable.
|
||||||
env RUBYOPT=-I$(pwd)/lib \
|
export CUCUMBER_PUBLISH_QUIET=true
|
||||||
cucumber --publish-quiet -f progress
|
env RUBYOPT=-I$(pwd)/lib cucumber -f progress
|
||||||
|
|
||||||
# Go back the skipped test
|
# Go back the skipped test
|
||||||
if test x"${PPC64_ENV_P}" == x0
|
if test x"${PPC64_ENV_P}" == x0
|
||||||
|
|
@ -168,6 +164,50 @@ popd # from .%%{gem_instdir}
|
||||||
%doc %{gem_instdir}/CHANGELOG.md
|
%doc %{gem_instdir}/CHANGELOG.md
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Dec 06 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.3-1
|
||||||
|
- 2.3.3
|
||||||
|
|
||||||
|
* Sun Sep 14 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.2-1
|
||||||
|
- 2.3.2
|
||||||
|
|
||||||
|
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jun 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.1-1
|
||||||
|
- 2.3.1
|
||||||
|
|
||||||
|
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 03 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.0-1
|
||||||
|
- 2.3.0
|
||||||
|
|
||||||
|
* Thu Nov 28 2024 Vít Ondruch <vondruch@redhat.com> - 2.2.0-10
|
||||||
|
- Drop BR: rubygem(pry)
|
||||||
|
|
||||||
|
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Feb 08 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-8
|
||||||
|
- Adjust testsuite for Minitest 5.22.2
|
||||||
|
|
||||||
|
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Dec 27 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-5
|
||||||
|
- Patch for ruby3.3
|
||||||
|
|
||||||
|
* Thu Nov 9 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-4
|
||||||
|
- Explicitly add BR: less for BR: pry
|
||||||
|
- Change cucumber publish quiet method
|
||||||
|
|
||||||
|
* Mon Sep 11 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-2
|
||||||
|
- Kill python test entirely to redure BR, it is not important
|
||||||
|
(related to bug 2237692)
|
||||||
|
|
||||||
* Fri Sep 8 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-1
|
* Fri Sep 8 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-1
|
||||||
- 2.2.0
|
- 2.2.0
|
||||||
- Relax cucumber dependency
|
- Relax cucumber dependency
|
||||||
|
|
|
||||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
||||||
SHA512 (aruba-2.2.0.gem) = 61f87f9aa98b583359e7d00c3bc7e2302ba5ecc925dc6216dd15e03967a072be0f076f31abd9f756fb8bf31781191e23ca47d2858f832f020633cd65e408298c
|
SHA512 (aruba-2.3.3.gem) = 4892651a703d0b2badf15a7f45e461ab1478e53d290fc39e7b0a3fa2a4c4830754bdcabddb38ba3e161bd34071da85aad4f56ccaea5ff8b37a5d74ae1e7ca8c2
|
||||||
SHA512 (rubygem-aruba-2.2.0-testsuite.tar.gz) = 22d3caeb01885cbc4669af5f162d09c58d8259c393f9c74fbb8358a312f28570ec0f2aeeb97ba7923da0b24d9bc07772721e119b2b9d674c6767cfdb0221c501
|
SHA512 (rubygem-aruba-2.3.3-testsuite.tar.gz) = a2aa74d9c920dbc3b9709358f5e219886e54f92b85b34de15bd9614308dccd48a3f97bed2f286e8e4dc520259e63063d167a74d72ed70a0635cb8c7348ccb175
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue