fix features incompative

(cherry picked from commit fabe777580eb8d805d1d7dc31023342891c0d5c0)
This commit is contained in:
baizg1107 2022-03-02 11:27:31 +08:00 committed by openeuler-sync-bot
parent f701af483c
commit d5384985f4
2 changed files with 31 additions and 3 deletions

View File

@ -0,0 +1,24 @@
From e1170fbb7515309a5a27b7945c52f6a4c79e3abf Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
Date: Wed, 2 Mar 2022 16:17:36 +0800
Subject: [PATCH] fix features incompative
---
features/timeouts.feature | 1 +
1 file changed, 1 insertion(+)
diff --git a/features/timeouts.feature b/features/timeouts.feature
index f05fcd5..40d1f7c 100644
--- a/features/timeouts.feature
+++ b/features/timeouts.feature
@@ -52,6 +52,7 @@ Feature: Wire protocol timeouts
Scenario: Wired
Given we're all wired
Timed out calling wire server with message 'invoke' (Timeout::Error)
+ /usr/share/ruby/timeout.rb:112:in `timeout'
features/wired.feature:3:in `Given we're all wired'
Failing Scenarios:
--
2.27.0

View File

@ -2,15 +2,16 @@
%{?_with_bootstrap: %global bootstrap 1}
Name: rubygem-%{gem_name}
Version: 0.0.1
Release: 1
Release: 2
Summary: Wire protocol for Cucumber
License: MIT
URL: http://cucumber.io
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
Patch0: rubygem-cucumber-wire-0.0.1-Adapt-to-the-move-of-Location-to-Cucumber-Core-Test.patch
Patch1: 0001-fix-features-incompative.patch
BuildRequires: ruby(release) rubygems-devel ruby
%if ! 0%{?bootstrap}
BuildRequires: rubygem(aruba) rubygem(cucumber) rubygem(rspec)
BuildRequires: rubygem(aruba) rubygem(cucumber) rubygem(rspec) rubygem(did_you_mean)
%endif
BuildArch: noarch
%description
@ -28,6 +29,7 @@ Documentation for %{name}.
%prep
%setup -q -n %{gem_name}-%{version}
%patch0 -p1
%patch1 -p1
%gemspec_add_file 'lib/cucumber/wire/step_argument.rb'
%build
@ -43,7 +45,6 @@ cp -a .%{gem_dir}/* \
%check
pushd .%{gem_instdir}
LANG=C.UTF-8 rspec spec
sed -i "/(Timeout::Error)/ a\ /usr/share/ruby/timeout.rb:108:in \`timeout'" features/timeouts.feature
RUBYOPT="-I$(pwd)/lib" cucumber
popd
%endif
@ -65,5 +66,8 @@ popd
%{gem_instdir}/spec
%changelog
* Wed Mar 02 2022 baizhonggui <baizhonggui@huawei.com> - 0.0.1-2
- Add support ruby 3.0 for fixing build error
* Mon Aug 24 2020 liyanan <liyanan32@huawei.com> - 0.0.1-1
- package init