Skip to content

Commit e564595

Browse files
committed
Default main gemfile to rack 2 for now
1 parent 91e98ee commit e564595

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.rubocop.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins:
88
AllCops:
99
NewCops: enable
1010
DisabledByDefault: false
11-
TargetRubyVersion: 3.0
11+
TargetRubyVersion: 3.2
1212
Exclude:
1313
- 'vendor/**/*'
1414
- 'gemfiles/vendor/**/*'
@@ -257,3 +257,9 @@ Style/SuperArguments:
257257

258258
Style/FileNull:
259259
Enabled: false
260+
261+
Naming/BlockForwarding:
262+
Enabled: false
263+
264+
Style/ArrayIntersect:
265+
Enabled: false

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ source 'https://rubygems.org'
55
gem 'bundler', '< 3.0'
66
gemspec
77

8+
gem 'rack', '< 3.0'
89
gem 'xpath', github: 'teamcapybara/xpath'
9-
1010
# gem 'rack-test', github: 'rack/rack-test'
1111

1212
group :doc do

capybara.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require 'capybara/version'
88
Gem::Specification.new do |s|
99
s.name = 'capybara'
1010
s.version = Capybara::VERSION
11-
s.required_ruby_version = '>= 3.0.0'
11+
s.required_ruby_version = '>= 3.2.0'
1212
s.license = 'MIT'
1313

1414
s.authors = ['Thomas Walpole', 'Jonas Nicklas']

lib/capybara/spec/session/scroll_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
it 'can scroll the window to the vertical center' do
4545
@session.scroll_to :center
4646
max_scroll = @session.evaluate_script('document.documentElement.scrollHeight - document.documentElement.clientHeight')
47-
expect(@session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')).to eq [0, max_scroll / 2]
47+
expect(@session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')).to match [0, be_within(1).of(max_scroll / 2)]
4848
end
4949

5050
it 'can scroll the window to specific location' do

0 commit comments

Comments
 (0)