Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Update Cucumber #2877

Merged
merged 6 commits into from
Sep 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cucumber.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion features/step_definitions/additional_cli_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion features/support/require_expect_syntax_in_aruba_specs.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 4 additions & 5 deletions features/support/ruby_27_support.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
Around "@ruby-2-7" do |scenario, block|
if RUBY_VERSION.to_f == 2.7
block.call
else
warn "Skipping scenario #{scenario.title} on Ruby v#{RUBY_VERSION}"
Before "@ruby-2-7" do |scenario|
unless RUBY_VERSION.to_f == 2.7
warn "Skipping scenario #{scenario.name} on Ruby v#{RUBY_VERSION}"
skip_this_scenario
end
end
2 changes: 1 addition & 1 deletion rspec-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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', '>= 3.2', '!= 4.0.0', '< 8.0.0'
s.add_development_dependency "minitest", "~> 5.3"
s.add_development_dependency "aruba", "~> 0.14.9"

Expand Down