Skip to content

Commit b3d0ba2

Browse files
authored
bugfix: build failures (#548)
* Update hacking notes and tidy up gem restrictions * Shoe-horn in psych restrictions * Remove duplicate psych reference * Remove old note references as most are incorrect * Use appraisals to rebuild gemfiles * Remove temporary rdoc restriction * Add in deprecative versions of rhs * Fix rubocop
1 parent a6d60de commit b3d0ba2

File tree

10 files changed

+43
-38
lines changed

10 files changed

+43
-38
lines changed

Appraisals

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,54 @@
11
# frozen_string_literal: true
22

33
appraise 'rails_5_0' do
4+
gem 'activerecord'
45
gem 'capybara', '< 3'
56
gem 'cucumber', '< 4'
7+
gem 'psych', '< 4'
8+
gem 'rails-html-sanitizer', '< 1.4'
69
gem 'railties', '~> 5.0.7'
7-
gem 'activerecord'
810
gem 'sqlite3', '~> 1.3.13'
911
end
1012

1113
appraise 'rails_5_1' do
14+
gem 'activerecord'
1215
gem 'capybara', '< 3.15'
1316
gem 'cucumber', '< 5'
17+
gem 'psych', '< 4'
18+
gem 'rails-html-sanitizer', '< 1.4'
1419
gem 'railties', '~> 5.1.7'
15-
gem 'activerecord'
1620
gem 'sqlite3', '~> 1.3.13'
1721
end
1822

1923
appraise 'rails_5_2' do
24+
gem 'activerecord'
2025
gem 'capybara', '< 3.33'
2126
gem 'cucumber', '< 6'
27+
gem 'psych', '< 4'
28+
gem 'rails-html-sanitizer', '< 1.4.3'
2229
gem 'railties', '~> 5.2.4'
23-
gem 'activerecord'
2430
gem 'sqlite3', '~> 1.3.13'
2531
end
2632

2733
appraise 'rails_6_0' do
28-
gem 'cucumber', '< 6'
29-
gem 'railties', '~> 6.0.3'
3034
gem 'activerecord'
35+
gem 'cucumber', '< 6'
36+
gem 'psych', '< 4'
37+
gem 'rails-html-sanitizer', '< 1.4.3'
38+
gem 'railties', '~> 6.0.3'
3139
gem 'sqlite3', '~> 1.4'
3240
end
3341

3442
appraise 'rails_6_1' do
35-
gem 'railties', '~> 6.1.3'
3643
gem 'activerecord'
44+
gem 'cucumber', '< 9'
45+
gem 'psych', '< 4'
46+
gem 'railties', '~> 6.1.3'
3747
gem 'sqlite3', '~> 1.4'
3848
end
3949

4050
appraise 'rails_7_0' do
41-
gem 'railties', '~> 7.0.0'
4251
gem 'activerecord'
52+
gem 'railties', '~> 7.0.0'
4353
gem 'sqlite3', '~> 1.4'
4454
end

CONTRIBUTING.md

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ We appreciate that. But before you do, please learn our basic rules:
66
* Do you have an idea for a new feature? Then don't expect it to be implemented unless you or someone else sends a [pull request](https://help.github.com/articles/using-pull-requests). You might be better to start a discussion on [the google group](http://groups.google.com/group/cukes).
77
* Reporting a bug? Please tell us:
88
* which version of Cucumber you're using
9-
* which version of Ruby you're using.
9+
* which version of Ruby you're using
10+
* which version of Rails you're using (include all associated gems)
1011
* How to reproduce it. Bugs with a failing test in a [pull request](https://help.github.com/articles/using-pull-requests) get fixed much quicker. Some bugs may never be fixed.
11-
* Want to paste some code or output? Put \`\`\` on a line above and below your code/output. See [GFM](https://help.github.com/articles/github-flavored-markdown)'s *Fenced Code Blocks* for details.
12+
* Want to paste some code or output? Put ``` on a line above and below your code/output. See [GFM](https://help.github.com/articles/github-flavored-markdown)'s *Fenced Code Blocks* for details.
1213
* We love [pull requests](https://help.github.com/articles/using-pull-requests). But if you don't have a test to go with it we probably won't merge it.
1314

1415
# Contributing to cucumber-rails
@@ -58,18 +59,3 @@ Now release it
5859
bundle exec rake
5960
git commit -m "Release X.Y.Z"
6061
rake release
61-
62-
## Gaining Release Karma
63-
64-
To become a release manager, create a pull request adding your name to the list below, including
65-
your Rubygems email address in the ticket. One of the existing Release managers will then add you.
66-
67-
Current release managers:
68-
* Kosmas Chatzimichalis
69-
* Matt Wynne
70-
* Mathieu Jobin
71-
* Andrew Walter
72-
73-
To grant release karma, issue the following command:
74-
75-
gem owner cucumber-rails --add <NEW OWNER RUBYGEMS EMAIL>

Rakefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require 'rubygems'
66
require 'bundler'
77
require 'bundler/setup'
88
require 'appraisal'
9-
require 'rdoc' # https://github.com/lsegal/yard/commit/b861dcc2d7f7e1fbbed7b552ac2e4f7caf68bafa
9+
require 'rdoc'
1010
require 'rake/clean'
1111
require 'pathname'
1212
Bundler::GemHelper.install_tasks
@@ -40,8 +40,7 @@ end
4040
namespace :gemfiles do
4141
desc 'Install dependencies for all gemfiles'
4242
task :install do
43-
ENV['BUNDLE_GEMFILE'] = 'Gemfile.appraisal'
44-
Rake::Task['appraisal:install'].invoke
43+
system 'bundle exec appraisal update'
4544
end
4645

4746
task :clean do

cucumber-rails.gemspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Gem::Specification.new do |s|
2121
'source_code_uri' => "https://github.com/cucumber/cucumber-rails/tree/v#{s.version}"
2222
}
2323

24-
s.add_runtime_dependency('capybara', ['>= 2.18', '< 4']) # We support legacy capybara (But only the last 2.x)
25-
s.add_runtime_dependency('cucumber', '>= 3.2', '< 9') # Support cucumber in the 3.x <-> 7.x revision range
26-
s.add_runtime_dependency('mime-types', ['~> 3.3']) # Only support the latest major (3+ years old)
27-
s.add_runtime_dependency('nokogiri', '~> 1.10') # Only support the latest major (3+ years old)
28-
s.add_runtime_dependency('railties', ['>= 5.0', '< 8']) # We support any version of Rails in the 5.x, 6.x and 7.x series
24+
s.add_runtime_dependency('capybara', ['>= 2.18', '< 4'])
25+
s.add_runtime_dependency('cucumber', '>= 3.2', '< 9')
26+
s.add_runtime_dependency('mime-types', ['~> 3.3'])
27+
s.add_runtime_dependency('nokogiri', '~> 1.10')
28+
s.add_runtime_dependency('railties', ['>= 5.0', '< 8'])
2929
s.add_runtime_dependency('rexml', '~> 3.0') # rexml is a bundled gem from ruby 3
3030
s.add_runtime_dependency('webrick', '~> 1.7') # webrick is a bundled gem from ruby 3
3131

gemfiles/rails_5_0.gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
source "https://rubygems.org"
44

5+
gem "activerecord"
56
gem "capybara", "< 3"
67
gem "cucumber", "< 4"
8+
gem "psych", "< 4"
9+
gem "rails-html-sanitizer", "< 1.4"
710
gem "railties", "~> 5.0.7"
8-
gem "activerecord"
911
gem "sqlite3", "~> 1.3.13"
1012

1113
gemspec path: "../"

gemfiles/rails_5_1.gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
source "https://rubygems.org"
44

5+
gem "activerecord"
56
gem "capybara", "< 3.15"
67
gem "cucumber", "< 5"
8+
gem "psych", "< 4"
9+
gem "rails-html-sanitizer", "< 1.4"
710
gem "railties", "~> 5.1.7"
8-
gem "activerecord"
911
gem "sqlite3", "~> 1.3.13"
1012

1113
gemspec path: "../"

gemfiles/rails_5_2.gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
source "https://rubygems.org"
44

5+
gem "activerecord"
56
gem "capybara", "< 3.33"
67
gem "cucumber", "< 6"
8+
gem "psych", "< 4"
9+
gem "rails-html-sanitizer", "< 1.4.3"
710
gem "railties", "~> 5.2.4"
8-
gem "activerecord"
911
gem "sqlite3", "~> 1.3.13"
1012

1113
gemspec path: "../"

gemfiles/rails_6_0.gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
source "https://rubygems.org"
44

5+
gem "activerecord"
56
gem "cucumber", "< 6"
7+
gem "psych", "< 4"
8+
gem "rails-html-sanitizer", "< 1.4.3"
69
gem "railties", "~> 6.0.3"
7-
gem "activerecord"
810
gem "sqlite3", "~> 1.4"
911

1012
gemspec path: "../"

gemfiles/rails_6_1.gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
source "https://rubygems.org"
44

5-
gem "railties", "~> 6.1.3"
65
gem "activerecord"
6+
gem "cucumber", "< 9"
7+
gem "psych", "< 4"
8+
gem "railties", "~> 6.1.3"
79
gem "sqlite3", "~> 1.4"
810

911
gemspec path: "../"

gemfiles/rails_7_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "railties", "~> 7.0.0"
65
gem "activerecord"
6+
gem "railties", "~> 7.0.0"
77
gem "sqlite3", "~> 1.4"
88

99
gemspec path: "../"

0 commit comments

Comments
 (0)