Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Rails 5.2 & Capybara 3 support. #378

Merged
merged 32 commits into from Apr 20, 2018
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
416c543
Relax railites to allow version 5.2.
gobijan Apr 12, 2018
3bbb2a2
Add gemfile for rails 5.2.
gobijan Apr 12, 2018
238c391
Update 5.2 gemspec dependencies to latest available ones. Allow railt…
gobijan Apr 12, 2018
6100eb4
Make travis use latest ruby releases.
gobijan Apr 12, 2018
10084a9
Remove Ruby 2.2 from tests => EOL.
gobijan Apr 12, 2018
685413c
Bump version to 1.6 (because removing EOL Ruby 2.2)
gobijan Apr 12, 2018
dc6a590
Add rails 5.2 to appraisals.
gobijan Apr 12, 2018
937d44c
Bump geckodriver-helper version to 0.0.5
Apr 17, 2018
1ef3b51
Relax railites to allow version 5.2.
gobijan Apr 12, 2018
0775efb
Add gemfile for rails 5.2.
gobijan Apr 12, 2018
8362a27
Update 5.2 gemspec dependencies to latest available ones. Allow railt…
gobijan Apr 12, 2018
a6b99ea
Make travis use latest ruby releases.
gobijan Apr 12, 2018
bd504a6
Remove Ruby 2.2 from tests => EOL.
gobijan Apr 12, 2018
4cd9f63
Bump version to 1.6 (because removing EOL Ruby 2.2)
gobijan Apr 12, 2018
3b88c6b
Add rails 5.2 to appraisals.
gobijan Apr 12, 2018
e942fd1
factory_girl -> factory_bot
Apr 17, 2018
4502e05
Fix other occurrences of factory_girl
Apr 18, 2018
8b47a03
Merge branch 'master' into master
gobijan Apr 18, 2018
cfcd0ea
Merge pull request #1 from radar/master
gobijan Apr 18, 2018
286f37f
Make click_with_javascript_emulation take any args
Apr 19, 2018
f11ad2d
install the latest version of firefox
Apr 19, 2018
6f83768
Report geckodriver version before running tests
Apr 19, 2018
c1a6626
Fixed bootsnap issues on Rails 5.2
xtrasimplicity Apr 19, 2018
32ba8db
Merge pull request #6 from xtrasimplicity/BugFix/FixingBootsnapIssues
gobijan Apr 20, 2018
8300612
Merge pull request #5 from radar/use-latest-firefox
gobijan Apr 20, 2018
4763fde
Merge pull request #4 from radar/click-with-js-emulation-args
gobijan Apr 20, 2018
8fb4040
Switched back to new hash key assignment syntax.
xtrasimplicity Apr 20, 2018
1a85e85
Re-added support for Ruby 2.2
xtrasimplicity Apr 20, 2018
dee9b75
Switched aruba dependency back to "strict" versioning ('~>' rather th…
xtrasimplicity Apr 20, 2018
eab831a
CI: force failed `geckodriver -V` commands to retry once.
xtrasimplicity Apr 20, 2018
9731f9b
Revert CI: force failed `geckodriver -V` commands to retry once. (eab…
xtrasimplicity Apr 20, 2018
c480e62
Fixed RSpec versioning
xtrasimplicity Apr 20, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 8 additions & 9 deletions .travis.yml
@@ -1,8 +1,7 @@
rvm:
- 2.2.9
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest keeping this, as cucumber-rails still is using Ruby 2.2. If Rails 5.2 requires higher, then I suggest excluding it below in .travis.yml.

- 2.3.6
- 2.4.3
- 2.5.0
- 2.3.7
- 2.4.4
- 2.5.1
- ruby-head

# whitelist
Expand All @@ -11,6 +10,7 @@ branches:
- master

gemfile:
- gemfiles/rails_5_2.gemfile
- gemfiles/rails_5_1.gemfile
- gemfiles/rails_5_0.gemfile
- gemfiles/rails_4_2.gemfile
Expand All @@ -20,15 +20,14 @@ gemfile:
matrix:
fast_finish: true
exclude:
- rvm: 2.4.3
- rvm: 2.4.4
gemfile: gemfiles/rails_4_0.gemfile
- rvm: 2.4.3
- rvm: 2.4.4
gemfile: gemfiles/rails_4_1.gemfile
- rvm: 2.5.0
- rvm: 2.5.1
gemfile: gemfiles/rails_4_0.gemfile
- rvm: 2.5.0
- rvm: 2.5.1
gemfile: gemfiles/rails_4_1.gemfile

- rvm: ruby-head
gemfile: gemfiles/rails_4_0.gemfile
- rvm: ruby-head
Expand Down
14 changes: 14 additions & 0 deletions Appraisals
Expand Up @@ -80,3 +80,17 @@ appraise "rails_5_1" do
# Rails 5 requires database cleaner 1.1
gem "database_cleaner", ">= 1.1.0"
end

appraise "rails_5_2" do
gem "rails", "~> 5.2"
gem "railties", "~> 5.2"
gem "capybara", "~> 3"
gem "selenium-webdriver", "~> 3.11"
gem "geckodriver-helper", "~> 0.0.4"
gem "rspec-rails", "~> 3.7"
gem "sass-rails", "~> 5.0"
gem "coffee-rails", "~> 4.2.0"
gem "uglifier", "~> 4.1"
gem "sqlite3", "~> 1.3.13"
gem "database_cleaner", ">= 1.1"
end
14 changes: 7 additions & 7 deletions cucumber-rails.gemspec
Expand Up @@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)

Gem::Specification.new do |s|
s.name = 'cucumber-rails'
s.version = '1.5.0'
s.version = '1.6.0'
s.authors = ["Aslak Hellesøy", "Dennis Blöte", "Rob Holland"]
s.description = "Cucumber Generator and Runtime for Rails"
s.summary = "#{s.name}-#{s.version}"
Expand All @@ -12,23 +12,23 @@ Gem::Specification.new do |s|

s.license = 'MIT'

s.add_runtime_dependency('capybara', ['>= 1.1.2', '< 3'])
s.add_runtime_dependency('capybara', ['>= 1.1.2', '< 4'])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also resolves @Kosmas' request here: #375 (comment) 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

s.add_runtime_dependency('cucumber', ['>= 3.0.2', '< 4'])
s.add_runtime_dependency('nokogiri', '~> 1.5')
s.add_runtime_dependency('railties', ['>= 4', '< 5.2'])
s.add_runtime_dependency('nokogiri', '~> 1.8')
s.add_runtime_dependency('railties', ['>= 4', '< 6'])
s.add_runtime_dependency('mime-types', ['>= 1.17', '< 4'])

# Main development dependencies
s.add_development_dependency('ammeter', ['>= 1.0.0', '!= 1.1.3'])
s.add_development_dependency('appraisal', '>= 0.5.1')
s.add_development_dependency('aruba', '~> 0.14.2')
s.add_development_dependency('aruba', '>= 0.14.2')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latest release of aruba is in the 0.14.x series, so this change has no effect currently.

s.add_development_dependency('builder', ['>= 3.1.0', '< 4'])
s.add_development_dependency('bundler', '>= 1.3.5')
s.add_development_dependency('selenium-webdriver', '>= 3.4.1')
s.add_development_dependency('database_cleaner', '>= 1.0.0')
s.add_development_dependency('factory_girl', '>= 3.2')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider changing this to factory_bot while you're here too. There will need to be some other changes made to the features (like emulate_javascript.feature too)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just submitted a PR to your repo for this: gobijan#2

s.add_development_dependency('rake', '>= 0.9.2.2')
s.add_development_dependency('rspec', '~> 3.0')
s.add_development_dependency('rspec', '~> 3')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will allow RSpec 4, which is probably not what you want.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should become ~> 3.0 again to avoid allowing rspec 4 automatically when it arrives.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woops. I'll fix that now - thanks @mvz!

s.add_development_dependency('rails')
s.add_development_dependency('sqlite3')

Expand All @@ -37,7 +37,7 @@ Gem::Specification.new do |s|
s.add_development_dependency('rdoc', '>= 3.4')
s.add_development_dependency('yard', '>= 0.8.7')

s.required_ruby_version = '>= 2.2.0'
s.required_ruby_version = '>= 2.3.0'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cucumber-ruby supports >= 2.2, so we should change this back to keep things standardised.

s.rubygems_version = ">= 1.6.1"
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {spec,features}/*`.split("\n")
Expand Down
17 changes: 17 additions & 0 deletions gemfiles/rails_5_2.gemfile
@@ -0,0 +1,17 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 5.2"
gem "railties", "~> 5.2"
gem "capybara", "~> 3.0"
gem "selenium-webdriver", "~> 3.11"
gem "geckodriver-helper", "~> 0.0.4"
gem "rspec-rails", "~> 3.7"
gem "sass-rails", "~> 5.0"
gem "coffee-rails", "~> 4.2"
gem "uglifier", "~> 4.1"
gem "sqlite3", "~> 1.3.13"
gem "database_cleaner", ">= 1.6.2"

gemspec path: "../"