Rebase master to 4-0-dev and fix build #2160
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
benoittgt
force-pushed
the
rebase_4-0-dev
branch
2 times, most recently
from
57866e3
to
eb919ba
Compare
benoittgt
changed the title
benoittgt
force-pushed
the
rebase_4-0-dev
branch
2 times, most recently
from
5ffd287
to
1915025
Compare
|
I will fix the Rubocop offenses tonight if I have time. This will change 955a99c a little bit. Maybe @samphippen you do not agree? |
benoittgt
force-pushed
the
rebase_4-0-dev
branch
from
1915025
to
4ca55c7
Compare
|
Ok... I think we should maybe unsync rubocop from the rest of RSpec... At the moment if we jump back to 0.52 Way too many cops have changed. I think the goal of RSpec 4 will be also to jump to the last rubocop like I lock Rubocop to version 0.74 |
benoittgt
force-pushed
the
rebase_4-0-dev
branch
from
e367a85
to
144c877
Compare
|
CI looks better. For Rails version below 5 it was looking similar to what you fixed Jon. I removed the restriction to
On jruby-head and Rails 6 I commented on an open issue: jruby/activerecord-jdbc-adapter#980 and the super team there help me identifying a wrong version on |
benoittgt
force-pushed
the
rebase_4-0-dev
branch
2 times, most recently
from
193dc0d
to
3a345bb
Compare
benoittgt
commented
Aug 27, 2019
Gemfile-rails-dependencies
Outdated
| @@ -33,5 +33,10 @@ else | |||
| if version >= '5-1-stable' && RUBY_VERSION >= "2.3" | |||
| gem "puma" | |||
| end | |||
| gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby] | |||
|
|
|||
| if /(\d+)/.match(ENV['RAILS_VERSION'])[1].to_i >= 6 | |||
There was a problem hiding this comment.
Not super fan about this. Maybe you have better idea @JonRowe
There was a problem hiding this comment.
We usually do ENV['RAILS_VERSION'].to_f >= 6.0 etc but you do sometimes have to stripe the other chars, I'd probably use .gsub(/[^\d\.]/,'').to_f or similar
There was a problem hiding this comment.
Thanks! Applied in fe90da4
Happy to merge the PR if you are ok.
[skip ci]
Prevent webdrivers from using `&.` method on unsupported ruby.
RVM doesn't provide old Ruby binaries for newer Ubuntu distributions. Until it's fixed, we need to use old Ubuntu distributions in CI.
…ase'
On Rails 6 we add error in test suite like:
```
LoadError: cannot load such file -- selenium/webdriver System test integration requires Rails >= 5.1 and has a hard dependency on a webserver and `capybara`, please add capybara to your Gemfile and configure a webserver (e.g. `Capybara.server = :webrick`) before attempting to use system specs.
```
Thoses errors come from
`lib/rspec/rails/example/system_example_group.rb#L51`:
```
2.6.3 :002 > require 'action_dispatch/system_test_case'
Traceback (most recent call last):
16: from /Users/bti/code/rspec-dev/repos/rspec-rails/spec/rspec/rails/example/system_example_group_spec.rb:11:in `block (4 levels) in <module:Rails>'
15: from /Users/bti/code/rspec-dev/repos/rspec-rails/spec/rspec/rails/example/system_example_group_spec.rb:11:in `include'
14: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/activesupport-6.0.0/lib/active_support/concern.rb:122:in `append_features'
13: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/activesupport-6.0.0/lib/active_support/concern.rb:122:in `class_eval'
12: from /Users/bti/code/rspec-dev/repos/rspec-rails/lib/rspec/rails/example/system_example_group.rb:50:in `block in <module:SystemExampleGroup>'
11: from <internal:prelude>:145:in `irb'
10: from (irb):2:in `block in <module:SystemExampleGroup>'
9: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/activesupport-6.0.0/lib/active_support/dependencies.rb:325:in `require'
8: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/activesupport-6.0.0/lib/active_support/dependencies.rb:291:in `load_dependency'
7: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/activesupport-6.0.0/lib/active_support/dependencies.rb:325:in `block in require'
6: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/activesupport-6.0.0/lib/active_support/dependencies.rb:325:in `require'
5: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/actionpack-6.0.0/lib/action_dispatch/system_test_case.rb:7:in `<top (required)>'
4: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/activesupport-6.0.0/lib/active_support/dependencies.rb:325:in `require'
3: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/activesupport-6.0.0/lib/active_support/dependencies.rb:291:in `load_dependency'
2: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/activesupport-6.0.0/lib/active_support/dependencies.rb:325:in `block in require'
1: from /Users/bti/.rvm/gems/ruby-2.6.3/gems/activesupport-6.0.0/lib/active_support/dependencies.rb:325:in `require'
LoadError (cannot load such file -- selenium/webdriver)
```
This is probably related to:
> rails/rails#36592
We need to load selenium-driver if we are in Rails 6
This is the same version as: https://github.com/rspec/rspec-expectations/blob/master/Gemfile#L65 Related: rspec/rspec-dev#222 (comment)
benoittgt
force-pushed
the
rebase_4-0-dev
branch
from
3a345bb
to
fe90da4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Address merge conflict in #2071