From 238392edc633b8b2a958664fcbeb7837e6a6f7f6 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Fri, 26 Feb 2021 10:22:31 +0100 Subject: [PATCH 1/6] Update cucumber to version 2.4 --- rspec-core.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rspec-core.gemspec b/rspec-core.gemspec index 6760b590d7..0cca2fb7dc 100644 --- a/rspec-core.gemspec +++ b/rspec-core.gemspec @@ -44,7 +44,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency "rspec-support", "~> #{RSpec::Core::Version::STRING.split('.')[0..1].concat(['3']).join('.')}" end - s.add_development_dependency "cucumber", "~> 1.3" + s.add_development_dependency "cucumber", "~> 2.4.0" s.add_development_dependency "minitest", "~> 5.3" s.add_development_dependency "aruba", "~> 0.14.9" From fd21f207578403a87a0ca7d5cd95c936c204f1ab Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sun, 28 Feb 2021 11:59:38 +0100 Subject: [PATCH 2/6] Use regular Cucumber scenario skipping method --- features/support/ruby_27_support.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/features/support/ruby_27_support.rb b/features/support/ruby_27_support.rb index b44e89c69b..026cbdcaaf 100644 --- a/features/support/ruby_27_support.rb +++ b/features/support/ruby_27_support.rb @@ -1,7 +1,6 @@ -Around "@ruby-2-7" do |scenario, block| - if RUBY_VERSION.to_f == 2.7 - block.call - else +Before "@ruby-2-7" do |scenario| + unless RUBY_VERSION.to_f == 2.7 warn "Skipping scenario #{scenario.title} on Ruby v#{RUBY_VERSION}" + skip_this_scenario end end From 1e94b7d83bdf6d137b685425460b0363b105ac7f Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sun, 28 Feb 2021 11:56:54 +0100 Subject: [PATCH 3/6] Fix deprecation --- features/support/ruby_27_support.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/support/ruby_27_support.rb b/features/support/ruby_27_support.rb index 026cbdcaaf..ab3373bfba 100644 --- a/features/support/ruby_27_support.rb +++ b/features/support/ruby_27_support.rb @@ -1,6 +1,6 @@ Before "@ruby-2-7" do |scenario| unless RUBY_VERSION.to_f == 2.7 - warn "Skipping scenario #{scenario.title} on Ruby v#{RUBY_VERSION}" + warn "Skipping scenario #{scenario.name} on Ruby v#{RUBY_VERSION}" skip_this_scenario end end From b4072f497ec4dc1dcbe76e900dac93aa4fad64ec Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sun, 28 Feb 2021 11:44:26 +0100 Subject: [PATCH 4/6] Update cucumber to 3.2 --- rspec-core.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rspec-core.gemspec b/rspec-core.gemspec index 0cca2fb7dc..c6b7e9eaa5 100644 --- a/rspec-core.gemspec +++ b/rspec-core.gemspec @@ -44,7 +44,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency "rspec-support", "~> #{RSpec::Core::Version::STRING.split('.')[0..1].concat(['3']).join('.')}" end - s.add_development_dependency "cucumber", "~> 2.4.0" + s.add_development_dependency "cucumber", "~> 3.2.0" s.add_development_dependency "minitest", "~> 5.3" s.add_development_dependency "aruba", "~> 0.14.9" From 1aba9310045b45a5855eb3c2db307ad18e0c1f84 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Sun, 28 Feb 2021 12:20:55 +0100 Subject: [PATCH 5/6] Fix step definition --- features/step_definitions/additional_cli_steps.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/step_definitions/additional_cli_steps.rb b/features/step_definitions/additional_cli_steps.rb index 8923546e00..01a64aac4f 100644 --- a/features/step_definitions/additional_cli_steps.rb +++ b/features/step_definitions/additional_cli_steps.rb @@ -108,7 +108,7 @@ set_environment_variable('RUBYOPT', ENV['RUBYOPT'] + " -I#{gem_dir}/lib") end -When "I accept the recommended settings by removing `=begin` and `=end` from `spec/spec_helper.rb`" do +When /I accept the recommended settings by removing `=begin` and `=end` from `spec\/spec_helper.rb`/ do cd('.') do spec_helper = File.read("spec/spec_helper.rb") expect(spec_helper).to include("=begin", "=end") From 840006b1b9a588a63e088617d7298e9710fb4133 Mon Sep 17 00:00:00 2001 From: Phil Pirozhkov Date: Sun, 5 Sep 2021 17:09:39 +0300 Subject: [PATCH 6/6] Update Cucumber to version 7 cucumber 4.0.0 is not aware of breaking changes in diff-lcs 1.4.3, so excluding it cucumber 4.0.0 would run on Ruby 2.3, 2.4 and JRuby 9.1 --- cucumber.yml | 2 +- features/support/require_expect_syntax_in_aruba_specs.rb | 2 +- rspec-core.gemspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cucumber.yml b/cucumber.yml index 3ce5b61d81..cf77f247d6 100644 --- a/cucumber.yml +++ b/cucumber.yml @@ -1,2 +1,2 @@ -default: --require features --strict --format progress --tags ~@wip features +default: --require features --strict --format progress --tags 'not @wip' features wip: --require features --tags @wip:30 --wip features diff --git a/features/support/require_expect_syntax_in_aruba_specs.rb b/features/support/require_expect_syntax_in_aruba_specs.rb index 733e707abd..c09495e55d 100644 --- a/features/support/require_expect_syntax_in_aruba_specs.rb +++ b/features/support/require_expect_syntax_in_aruba_specs.rb @@ -1,6 +1,6 @@ if defined?(Cucumber) require 'shellwords' - Before('~@with-clean-spec-opts') do + Before('not @with-clean-spec-opts') do set_environment_variable('SPEC_OPTS', "-r#{Shellwords.escape(__FILE__)}") end else diff --git a/rspec-core.gemspec b/rspec-core.gemspec index c6b7e9eaa5..893e341f48 100644 --- a/rspec-core.gemspec +++ b/rspec-core.gemspec @@ -44,7 +44,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency "rspec-support", "~> #{RSpec::Core::Version::STRING.split('.')[0..1].concat(['3']).join('.')}" end - s.add_development_dependency "cucumber", "~> 3.2.0" + s.add_development_dependency 'cucumber', '>= 3.2', '!= 4.0.0', '< 8.0.0' s.add_development_dependency "minitest", "~> 5.3" s.add_development_dependency "aruba", "~> 0.14.9"