commit: 84e0c86bc1f5eed14458c8709848d54c47e54c21
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 08:48:12 2023 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 08:49:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e0c86b
dev-ruby/rake-compiler: fix cucumber features for rspec 3
This allows us to drop the last rspec:2 dependency.
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild
b/dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild
index f09f3ca19bdb..a98de583e37f 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild
@@ -27,24 +27,24 @@ ruby_add_rdepend "dev-ruby/rake"
ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-USE_RUBY="ruby26 ruby27" ruby_add_bdepend "test? ( dev-util/cucumber
dev-ruby/rspec:2 )"
+USE_RUBY="ruby27 ruby30 ruby31" ruby_add_bdepend "test? ( dev-util/cucumber )"
all_ruby_prepare() {
- # Make sure the right rspec version is used in cucumber.
- sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
-
# Avoid failing features for native gems, this also fails with rubygems
sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature ||
die
# Fix compatibility with newer cucumber versions. The not syntax has
# been supported since cucumber 3.x.
sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
+
+ # Fix compatibility with newer rspec versions.
+ sed -i -e 's/be_true/be true/ ; s/be_false/be false/'
features/step_definitions/*.rb || die
}
each_ruby_test() {
# Skip cucumber for new ruby versions (not ready yet due to rspec 2
usage)
case ${RUBY} in
- *ruby26|*ruby27)
+ *ruby27|*ruby30|*ruby31)
RSPEC_VERSION=3 ruby-ng_rspec
ruby-ng_cucumber
;;
