From d30659baf5f45484109f331590d840ffca62bf72 Mon Sep 17 00:00:00 2001 From: Yohei Kitamura Date: Mon, 18 Oct 2021 21:35:41 -0400 Subject: [PATCH] cucumber 7 support (#91) * cucumber 7 support * Update gemfiles/Gemfile-rails.4.2.x.lock --- .github/workflows/build.yml | 3 +++ History.txt | 6 ++++++ README.md | 1 + gemfiles/Gemfile-rails.4.2.x.lock | 26 +++++++++++++------------- gemfiles/Gemfile-rails.6.0.x-cukes-7 | 11 +++++++++++ gemfiles/Gemfile-rails.6.1.x-cukes-7 | 11 +++++++++++ lib/pickle/version.rb | 2 +- pickle.gemspec | 2 +- 8 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 gemfiles/Gemfile-rails.6.0.x-cukes-7 create mode 100644 gemfiles/Gemfile-rails.6.1.x-cukes-7 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc3add47..2ede515c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,9 @@ jobs: # Cucumber 6 - Gemfile-rails.6.0.x-cukes-6 - Gemfile-rails.6.1.x-cukes-6 + # Cucumber 7 + - Gemfile-rails.6.0.x-cukes-7 + - Gemfile-rails.6.1.x-cukes-7 # Edge - Gemfile-rails.edge exclude: diff --git a/History.txt b/History.txt index d748a48a..6e209787 100644 --- a/History.txt +++ b/History.txt @@ -1,3 +1,9 @@ +== 0.6.2 +* Relax dependency to support cucumber 7.x + +== 0.6.1 +* Relax dependency to support cucumber 6.x + == 0.6.0 * Drop support for cucumber < 3 * Officially support cucumber 4.1 diff --git a/README.md b/README.md index d8ae7bfa..671b8c74 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Cucumber 3.x - support is best-effort basis, but tests run on rails 4.2 all the Cucumber 4.x - should work with all Rails 5.x versions, tests only run for 5.2 and 6.0 Cucumber 5.x - all tests pass for rails 5.2, 6.0 and 6.1 Cucumber 6.x - all tests pass for rails 6.0 and 6.1 +Cucumber 7.x - all tests pass for rails 6.0 and 6.1 Please open pull-requests with fixes if you encounter any problems. No active development on this gem. diff --git a/gemfiles/Gemfile-rails.4.2.x.lock b/gemfiles/Gemfile-rails.4.2.x.lock index a9a418ca..71864e11 100644 --- a/gemfiles/Gemfile-rails.4.2.x.lock +++ b/gemfiles/Gemfile-rails.4.2.x.lock @@ -8,8 +8,8 @@ GIT PATH remote: .. specs: - pickle (0.6.1) - cucumber (>= 3.0, < 7.0) + pickle (0.6.2) + cucumber (>= 3.0, < 8.0) rake GEM @@ -49,7 +49,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) arel (6.0.4) backports (3.21.0) @@ -62,7 +62,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - codecov (0.5.2) + codecov (0.6.0) simplecov (>= 0.15, < 0.22) concurrent-ruby (1.1.9) crass (1.0.6) @@ -95,13 +95,13 @@ GEM factory_bot (5.2.0) activesupport (>= 4.2.0) gherkin (5.1.0) - git (1.8.1) + git (1.9.1) rchardet (~> 1.8) globalid (0.4.2) activesupport (>= 4.2.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - loofah (2.10.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) machinist (2.0) @@ -109,14 +109,14 @@ GEM mini_mime (>= 0.1.1) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0225) - mini_mime (1.1.0) - mini_portile2 (2.5.3) + mime-types-data (3.2021.0901) + mini_mime (1.1.2) + mini_portile2 (2.6.1) minitest (5.14.4) multi_json (1.15.0) multi_test (0.1.2) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) racc (~> 1.4) public_suffix (4.0.6) racc (1.5.2) @@ -140,14 +140,14 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) railties (4.2.11.3) actionpack (= 4.2.11.3) activesupport (= 4.2.11.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (13.0.3) + rake (13.0.6) rchardet (1.8.0) regexp_parser (2.1.1) rspec-core (3.9.3) diff --git a/gemfiles/Gemfile-rails.6.0.x-cukes-7 b/gemfiles/Gemfile-rails.6.0.x-cukes-7 new file mode 100644 index 00000000..0505a50d --- /dev/null +++ b/gemfiles/Gemfile-rails.6.0.x-cukes-7 @@ -0,0 +1,11 @@ +source "http://rubygems.org" + +# Bundler 1.x default to insecure http:// for github: shortcut +git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" } + +gemspec :path => ".." + +gem "rails", "~> 6.0.0" +gem "cucumber", "~> 7.0" +gem "cucumber-rails" +gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800' diff --git a/gemfiles/Gemfile-rails.6.1.x-cukes-7 b/gemfiles/Gemfile-rails.6.1.x-cukes-7 new file mode 100644 index 00000000..300171c1 --- /dev/null +++ b/gemfiles/Gemfile-rails.6.1.x-cukes-7 @@ -0,0 +1,11 @@ +source "http://rubygems.org" + +# Bundler 1.x default to insecure http:// for github: shortcut +git_source(:github){ |repo_name| "https://github.com/#{repo_name}.git" } + +gemspec :path => ".." + +gem "rails", "~> 6.1.0" +gem "cucumber", "~> 7.0" +gem "cucumber-rails" +gem 'fabrication', github: 'mathieujobin/fabrication', ref: '923cf6fcefd0566b1d6be7bd2f685b89388f4800' diff --git a/lib/pickle/version.rb b/lib/pickle/version.rb index dbab8427..72709bef 100644 --- a/lib/pickle/version.rb +++ b/lib/pickle/version.rb @@ -1,3 +1,3 @@ module Pickle - VERSION = "0.6.1" + VERSION = "0.6.2" end diff --git a/pickle.gemspec b/pickle.gemspec index fb427269..33739661 100644 --- a/pickle.gemspec +++ b/pickle.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") s.require_paths = ["lib"] - s.add_dependency "cucumber", ">=3.0", "< 7.0" + s.add_dependency "cucumber", ">=3.0", "< 8.0" s.add_dependency "rake" s.add_development_dependency "rack"