From 32f06947777f68c4444dd71ec71f87ea531b99d1 Mon Sep 17 00:00:00 2001 From: Luke Hill <20105237+luke-hill@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:27:20 +0000 Subject: [PATCH] refactor: Remove redundant gems (#1743) * No verbose requirements for syntax or test-unit as gems * Update of dependent gems * Update changelog * Removed sinatra example as it was extremely straw-man and it should be tested elsewhere * Removed rack-test dependency as it was required through capybara which is no longer required * Permit next major of messages coming out soon * Update readme for i18n examples --- CHANGELOG.md | 10 ++++-- cucumber.gemspec | 34 ++++++------------- examples/i18n/README.md | 4 +++ examples/i18n/README.textile | 3 -- examples/sinatra/README.textile | 13 ------- examples/sinatra/Rakefile | 8 ----- examples/sinatra/app.rb | 16 --------- examples/sinatra/features/add.feature | 11 ------ .../features/step_definitions/add_steps.rb | 17 ---------- examples/sinatra/features/support/env.rb | 11 ------ examples/sinatra/views/add.erb | 7 ---- examples/sinatra/views/layout.erb | 8 ----- 12 files changed, 23 insertions(+), 119 deletions(-) create mode 100644 examples/i18n/README.md delete mode 100644 examples/i18n/README.textile delete mode 100644 examples/sinatra/README.textile delete mode 100644 examples/sinatra/Rakefile delete mode 100644 examples/sinatra/app.rb delete mode 100644 examples/sinatra/features/add.feature delete mode 100644 examples/sinatra/features/step_definitions/add_steps.rb delete mode 100644 examples/sinatra/features/support/env.rb delete mode 100644 examples/sinatra/views/add.erb delete mode 100644 examples/sinatra/views/layout.erb diff --git a/CHANGELOG.md b/CHANGELOG.md index 293663037d..6761587565 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,16 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) for more info on how to contribute to Cucumber. ## [Unreleased] - -## [9.1.0] - 2023-11-14 ### Added +### Changed +- Updated dependencies to slightly more permissive / up to date versions ([luke-hill](https://github.com/luke-hill)) + +### Fixed + +### Removed + +## [9.1.0] - 2023-11-14 ### Changed - First couple of passes of tidying up approximately 40% of the manual fix cops ([#1739](https://github.com/cucumber/cucumber-ruby/pull/1739) [#1740](https://github.com/cucumber/cucumber-ruby/pull/1740) [#1741](https://github.com/cucumber/cucumber-ruby/pull/1741) [#1742](https://github.com/cucumber/cucumber-ruby/pull/1742) [luke-hill](https://github.com/luke-hill)) diff --git a/cucumber.gemspec b/cucumber.gemspec index 199b6d8df3..e6b210959a 100644 --- a/cucumber.gemspec +++ b/cucumber.gemspec @@ -26,40 +26,28 @@ Gem::Specification.new do |s| s.add_dependency 'cucumber-ci-environment', '~> 9.2', '>= 9.2.0' s.add_dependency 'cucumber-core', '~> 12.0' s.add_dependency 'cucumber-cucumber-expressions', '~> 17.0' - s.add_dependency 'cucumber-gherkin', '>= 24', '< 27' - s.add_dependency 'cucumber-html-formatter', '~> 20.4', '>= 20.4.0' - s.add_dependency 'cucumber-messages', '>= 19', '< 23' - s.add_dependency 'diff-lcs', '~> 1.5', '>= 1.5.0' + s.add_dependency 'cucumber-gherkin', '> 24', '< 27' + s.add_dependency 'cucumber-html-formatter', '> 20.3', '< 22' + s.add_dependency 'cucumber-messages', '> 19', '< 25' + s.add_dependency 'diff-lcs', '~> 1.5' s.add_dependency 'mini_mime', '~> 1.1', '>= 1.1.5' s.add_dependency 'multi_test', '~> 1.1', '>= 1.1.0' s.add_dependency 'sys-uname', '~> 1.2', '>= 1.2.3' - s.add_development_dependency 'cucumber-compatibility-kit', '~> 14.0' + s.add_development_dependency 'cucumber-compatibility-kit', '~> 14.1' # Only needed whilst we are testing the formatters. Can be removed once we remove tests for those - s.add_development_dependency 'nokogiri', '~> 1.13', '>= 1.13.6' - s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6' - s.add_development_dependency 'rspec', '~> 3.12', '>= 3.12.0' + s.add_development_dependency 'nokogiri', '~> 1.14' + s.add_development_dependency 'rake', '~> 13.1' + s.add_development_dependency 'rspec', '~> 3.12' s.add_development_dependency 'rubocop', '~> 1.56.4' s.add_development_dependency 'rubocop-capybara', '~> 2.19.0' s.add_development_dependency 'rubocop-packaging', '~> 0.5.2' s.add_development_dependency 'rubocop-rake', '~> 0.6.0' - s.add_development_dependency 'rubocop-rspec', '~> 2.24.1' + s.add_development_dependency 'rubocop-rspec', '~> 2.25.0' s.add_development_dependency 'simplecov', '~> 0.22.0' - s.add_development_dependency 'syntax', '~> 1.2', '>= 1.2.2' - s.add_development_dependency 'test-unit', '~> 3.6', '>= 3.6.1' - s.add_development_dependency 'webrick', '~> 1.8', '>= 1.8.1' + s.add_development_dependency 'webrick', '~> 1.8' - # Needed for rake examples - s.add_development_dependency 'capybara', '~> 3.39', '>= 3.39.2' - s.add_development_dependency 'rack-test', '~> 2.1', '>= 2.1.0' - s.add_development_dependency 'sinatra', '~> 3.1', '>= 3.1.0' - - s.files = Dir[ - 'README.md', - 'LICENSE', - 'VERSION', - 'lib/**/*' - ] + s.files = Dir['README.md', 'LICENSE', 'VERSION', 'lib/**/*'] s.executables = ['cucumber'] s.rdoc_options = ['--charset=UTF-8'] s.require_path = 'lib' diff --git a/examples/i18n/README.md b/examples/i18n/README.md new file mode 100644 index 0000000000..050ba25a97 --- /dev/null +++ b/examples/i18n/README.md @@ -0,0 +1,4 @@ +# Internationalisation (i18n) examples + +Visit the [languages](https://cucumber.io/docs/gherkin/languages/) page for instructions on how to use Cucumber +in different languages - over 70 are currently supported. diff --git a/examples/i18n/README.textile b/examples/i18n/README.textile deleted file mode 100644 index 343d363b56..0000000000 --- a/examples/i18n/README.textile +++ /dev/null @@ -1,3 +0,0 @@ -h1. Internationalisation (i18n) examples - -Visit the "wiki":https://github.com/cucumber/cucumber/wiki/Spoken-languages for instructions on how to use Cucumber on different languages. diff --git a/examples/sinatra/README.textile b/examples/sinatra/README.textile deleted file mode 100644 index d4d4dc9d8e..0000000000 --- a/examples/sinatra/README.textile +++ /dev/null @@ -1,13 +0,0 @@ -h1. Sinatra and Cucumber - -This example will work with: - -* sinatra 0.9.4 -* rack-test 0.3.0 - -As of this writing, the latest released webrat gem isn't compatible with these gems, so you need this: - -* aslakhellesoy-webrat 0.4.4.1 - -That webrat gem is built from sr's ps2 branch: http://github.com/brynary/webrat/network - diff --git a/examples/sinatra/Rakefile b/examples/sinatra/Rakefile deleted file mode 100644 index a0c483a68c..0000000000 --- a/examples/sinatra/Rakefile +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib") -require 'cucumber/rake/task' - -Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w[--format pretty] -end diff --git a/examples/sinatra/app.rb b/examples/sinatra/app.rb deleted file mode 100644 index 95a0b62f9e..0000000000 --- a/examples/sinatra/app.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -begin - require 'sinatra' -rescue LoadError - require 'rubygems' - require 'sinatra' -end - -get '/add' do - erb :add -end - -post '/add' do - "Answer: #{params[:first].to_i + params[:second].to_i}" -end diff --git a/examples/sinatra/features/add.feature b/examples/sinatra/features/add.feature deleted file mode 100644 index 8792eec057..0000000000 --- a/examples/sinatra/features/add.feature +++ /dev/null @@ -1,11 +0,0 @@ -Feature: Addition - In order to avoid silly mistakes - As a math idiot - I want to be told the sum of two numbers - - Scenario: Add two numbers - Given I visit the calculator page - And I fill in '50' for 'first' - And I fill in '70' for 'Second' - When I press 'Add' - Then I should see 'Answer: 120' diff --git a/examples/sinatra/features/step_definitions/add_steps.rb b/examples/sinatra/features/step_definitions/add_steps.rb deleted file mode 100644 index 07aa08751e..0000000000 --- a/examples/sinatra/features/step_definitions/add_steps.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -Given(/^I visit the calculator page$/) do - visit '/add' -end - -Given(/^I fill in '(.*)' for '(.*)'$/) do |value, field| - fill_in(field, with: value) -end - -When(/^I press '(.*)'$/) do |name| - click_button(name) -end - -Then(/^I should see '(.*)'$/) do |text| - expect(body).to match(/#{text}/m) -end diff --git a/examples/sinatra/features/support/env.rb b/examples/sinatra/features/support/env.rb deleted file mode 100644 index 3562075832..0000000000 --- a/examples/sinatra/features/support/env.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -# See http://wiki.github.com/cucumber/cucumber/sinatra -# for more details about Sinatra with Cucumber - -require "#{File.dirname(__FILE__)}/../../app" - -require 'rack/test' -require 'capybara/cucumber' - -Capybara.app = Sinatra::Application diff --git a/examples/sinatra/views/add.erb b/examples/sinatra/views/add.erb deleted file mode 100644 index d6842d6255..0000000000 --- a/examples/sinatra/views/add.erb +++ /dev/null @@ -1,7 +0,0 @@ -
- - - - - -
diff --git a/examples/sinatra/views/layout.erb b/examples/sinatra/views/layout.erb deleted file mode 100644 index 1f1a5f9374..0000000000 --- a/examples/sinatra/views/layout.erb +++ /dev/null @@ -1,8 +0,0 @@ - - - Addition - - - <%= yield %> - - \ No newline at end of file