Skip to content

Commit 3acab3e

Browse files
authored
Support rubies 2.7, 3.0 and 3.1 in CI (#317)
1 parent 663dbdb commit 3acab3e

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ jobs:
1111
test:
1212
runs-on: ubuntu-latest
1313
strategy:
14+
fail-fast: false
1415
matrix:
15-
ruby-version: ['2.4', '2.5', '2.6']
16+
ruby-version: ['2.6', '2.7', '3.0', '3.1']
1617

1718
steps:
1819
- uses: actions/checkout@v2

lib/billy/browsers/watir.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ def initialize(name, args = {})
2020

2121
def configure_chrome(args)
2222
args[:headless] = true
23-
args[:switches] ||= []
24-
args[:switches] += %W[--proxy-server=#{Billy.proxy.host}:#{Billy.proxy.port}]
23+
args[:proxy] = {
24+
http: "#{Billy.proxy.host}:#{Billy.proxy.port}",
25+
ssl: "#{Billy.proxy.host}:#{Billy.proxy.port}"
26+
}
2527
args
2628
end
2729

puffing-billy.gemspec

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,23 @@ Gem::Specification.new do |gem|
1414
gem.name = 'puffing-billy'
1515
gem.require_paths = ['lib']
1616
gem.version = Billy::VERSION
17+
gem.required_ruby_version = '>= 2.6.0'
1718

1819
gem.add_development_dependency 'rspec'
1920
gem.add_development_dependency 'thin'
2021
gem.add_development_dependency 'faraday', '>= 0.9.0'
2122
gem.add_development_dependency 'apparition'
2223
gem.add_development_dependency 'capybara'
23-
gem.add_development_dependency 'selenium-webdriver'
24+
gem.add_development_dependency 'selenium-webdriver', '>= 4.0.0'
2425
gem.add_development_dependency 'rack'
2526
gem.add_development_dependency 'rake'
2627
gem.add_development_dependency 'guard'
2728
gem.add_development_dependency 'rb-inotify'
2829
gem.add_development_dependency 'pry'
2930
gem.add_development_dependency 'cucumber'
30-
gem.add_development_dependency 'watir', '~> 6.10.0'
31-
gem.add_development_dependency 'webdrivers'
31+
gem.add_development_dependency 'watir', '>= 7.0.0'
32+
gem.add_development_dependency 'webdrivers', '>= 5.0.0'
33+
gem.add_development_dependency 'webrick'
3234
gem.add_runtime_dependency 'addressable', '~> 2.5'
3335
gem.add_runtime_dependency 'eventmachine', '~> 1.2'
3436
gem.add_runtime_dependency 'em-synchrony'

spec/lib/billy/handlers/proxy_handler_spec.rb

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,10 @@
208208
allow(Billy.config).to receive(:proxied_request_connect_timeout).and_return(24)
209209

210210
expect(EventMachine::HttpRequest).to receive(:new).with(request[:url],
211-
inactivity_timeout: 42,
212-
connect_timeout: 24
211+
{
212+
inactivity_timeout: 42,
213+
connect_timeout: 24
214+
}
213215
)
214216

215217
subject.handle_request(request[:method],
@@ -223,9 +225,11 @@
223225
allow(Billy.config).to receive(:proxied_request_port).and_return('2080')
224226

225227
expect(EventMachine::HttpRequest).to receive(:new).with(request[:url],
226-
inactivity_timeout: 10,
227-
connect_timeout: 5,
228-
proxy: { host: '10.10.10.10', port: '2080' }
228+
{
229+
inactivity_timeout: 10,
230+
connect_timeout: 5,
231+
proxy: { host: '10.10.10.10', port: '2080' }
232+
}
229233
)
230234

231235
subject.handle_request(request[:method],

0 commit comments

Comments
 (0)