Merge pull request #2950 from rspec/update-ffi-ruby-23-windows

Fix builds by pinning gem versions (and wip try to update cucumber)

Author: JonRowe

Gemfile

@@ -20,7 +20,11 @@ group :documentation do
   gem 'github-markup', :platform => :mri
 end
 
-gem 'ffi', '~> 1.15.0'
+if RUBY_VERSION < '2.4.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
+  gem 'ffi', '< 1.15'
+else
+  gem 'ffi', '~> 1.15.0'
+end
 
 gem "jruby-openssl", platforms: :jruby
 

cucumber.yml

@@ -1,2 +1,10 @@
-default: --require features --strict --format progress --tags 'not @wip' features
+<%
+
+NOT_WIP_TAG = '"not @wip"'
+NOT_JRUBY_TAG = '"not @no-jruby"'
+
+exclusions = []
+exclusions << " --tags #{NOT_JRUBY_TAG}" if RUBY_PLATFORM == 'java'
+%>
+default: --require features --strict --format progress --tags <%= NOT_WIP_TAG %><%= exclusions.join %> features
 wip:     --require features --tags @wip:30 --wip features

features/command_line/init.feature

@@ -25,7 +25,7 @@ Feature: `--init` option
   Scenario: Accept and use the recommended settings in `spec_helper` (which are initially commented out)
     Given I have a brand new project with no files
       And I have run `rspec --init`
-     When I accept the recommended settings by removing `=begin` and `=end` from `spec/spec_helper.rb`
+     When I accept the recommended settings by removing `=begin` and `=end` from `spec_helper.rb`
       And I create "spec/addition_spec.rb" with the following content:
         """ruby
         RSpec.describe "Addition" do

features/metadata/described_class.feature

@@ -6,7 +6,11 @@ Feature: described class
   Scenario: Access the described class from the example
     Given a file named "spec/example_spec.rb" with:
       """ruby
-      RSpec.describe Fixnum do
+      RSpec.describe Symbol do
+        it "is available as described_class" do
+          expect(described_class).to eq(Symbol)
+        end
+
         describe 'inner' do
           describe String do
             it "is available as described_class" do

features/step_definitions/additional_cli_steps.rb

@@ -114,7 +114,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_helper.rb`') do
   cd('.') do
     spec_helper = File.read("spec/spec_helper.rb")
     expect(spec_helper).to include("=begin", "=end")

features/support/require_expect_syntax_in_aruba_specs.rb

@@ -1,6 +1,8 @@
 if defined?(Cucumber)
   require 'shellwords'
-  Before('not @with-clean-spec-opts') do
+  exclude_allow_should_syntax = 'not @allow-should-syntax'
+  exclude_with_clean_spec_ops = 'not @with-clean-spec-opts'
+  Before(exclude_allow_should_syntax, exclude_with_clean_spec_ops) do
     set_environment_variable('SPEC_OPTS', "-r#{Shellwords.escape(__FILE__)}")
   end
 else

features/support/ruby_27_support.rb

@@ -1,6 +1,7 @@
-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
+Around "@ruby-2-7" do |scenario, block|
+  if RUBY_VERSION.to_f == 2.7
+    block.call
+  else
+    skip_this_scenario "Skipping scenario #{scenario.name} on Ruby v#{RUBY_VERSION}"
   end
 end

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', '!= 4.0.0', '< 8.0.0'
+  s.add_development_dependency 'cucumber', '>= 3.2'
   s.add_development_dependency "minitest", "~> 5.3"
   s.add_development_dependency "aruba",    "~> 0.14.9"