Skip to content

Commit 9816645

Browse files
committed
[rb] fix test not handling redirect
1 parent b67f59f commit 9816645

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

rb/lib/selenium/server.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ def download(required_version = :latest)
9090

9191
File.open(download_file_name, 'wb') do |destination|
9292
net_http_start('github-releases.githubusercontent.com') do |http|
93-
request = Net::HTTP::Get.new redirected
94-
resp = http.request(request) do |response|
93+
request = Net::HTTP::Get.new redirected
94+
resp = http.request(request) do |response|
9595
total = response.content_length
9696
progress = 0
9797
segment_count = 0
@@ -127,17 +127,17 @@ def download(required_version = :latest)
127127

128128
def latest
129129
@latest ||= begin
130-
net_http_start('api.github.com') do |http|
131-
json = http.get('/repos/seleniumhq/selenium/releases').body
132-
JSON.parse(json).map { |release|
133-
release['assets']
134-
}.flatten.map { |asset|
135-
asset['name'][/selenium-server-(\d+\.\d+\.\d+)\.jar/, 1]
136-
}.compact.map { |version|
137-
Gem::Version.new(version)
138-
}.max.version
139-
end
140-
end
130+
net_http_start('api.github.com') do |http|
131+
json = http.get('/repos/seleniumhq/selenium/releases').body
132+
JSON.parse(json).map { |release|
133+
release['assets']
134+
}.flatten.map { |asset|
135+
asset['name'][/selenium-server-(\d+\.\d+\.\d+)\.jar/, 1]
136+
}.compact.map { |version|
137+
Gem::Version.new(version)
138+
}.max.version
139+
end
140+
end
141141
end
142142

143143
# @api private

rb/spec/unit/selenium/server_spec.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ module Selenium
116116
download = 'https://github.com/seleniumhq/selenium/releases/download'
117117

118118
stub_request(:get, "#{download}/selenium-10.0.0/#{expected_download_file_name}")
119+
.to_return(headers: {location: 'https://github-releases.githubusercontent.com/something'})
120+
121+
stub_request(:get, "https://github-releases.githubusercontent.com/something")
119122
.to_return(body: 'this is pretending to be a jar file for testing purposes')
120123

121124
begin
@@ -175,8 +178,7 @@ module Selenium
175178
"assets": {
176179
"name": 'selenium-server-10.0.1.jar',
177180
"browser_download_url": "#{repo}/selenium-10.0.1/selenium-server-10.0.1.jar"
178-
}}
179-
]
181+
}}]
180182

181183
stub_request(:get, repo).to_return(body: example_json.to_json)
182184

0 commit comments

Comments
 (0)