Skip to content

Commit 26b9f66

Browse files
committed
[rb] remove references to testing firefox nightly
can still specify desired browser by setting path in ENV['FIREFOX_BINARY']
1 parent 59763fc commit 26b9f66

File tree

7 files changed

+14
-22
lines changed

7 files changed

+14
-22
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ _browsername_:
237237
* chrome
238238
* edge
239239
* firefox
240-
* firefox-nightly (requires setting `ENV['FIREFOX_NIGHTLY_BINARY']` with the path to the browser executable)
240+
* ie
241241
* safari
242242
* safari-preview
243243

Rakefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ task test_rb: ['//rb:unit-test', :test_rb_local, :test_rb_remote]
246246
task test_rb_local: [
247247
'//rb:chrome-test',
248248
'//rb:firefox-test',
249-
('//rb:firefox-nightly-test' if ENV['FIREFOX_NIGHTLY_BINARY']),
250249
('//rb:safari-preview-test' if SeleniumRake::Checks.mac?),
251250
('//rb:safari-test' if SeleniumRake::Checks.mac?),
252251
('//rb:ie-test' if SeleniumRake::Checks.windows?),
@@ -256,7 +255,6 @@ task test_rb_local: [
256255
task test_rb_remote: [
257256
'//rb:remote-chrome-test',
258257
'//rb:remote-firefox-test',
259-
('//rb:remote-firefox-nightly-test' if ENV['FIREFOX_NIGHTLY_BINARY']),
260258
('//rb:remote-safari-test' if SeleniumRake::Checks.mac?),
261259
('//rb:remote-safari-preview-test' if SeleniumRake::Checks.mac?),
262260
('//rb:remote-ie-test' if SeleniumRake::Checks.windows?),

rb/spec/integration/selenium/webdriver/bidi_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
module Selenium
2323
module WebDriver
24-
describe BiDi, exclusive: {browser: %i[chrome_beta firefox firefox_nightly]} do
24+
describe BiDi, exclusive: {browser: %i[chrome_beta firefox]} do
2525
it 'gets session status' do
2626
status = driver.bidi.session.status
2727
expect(status).to respond_to(:ready)

rb/spec/integration/selenium/webdriver/devtools_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
module Selenium
2323
module WebDriver
24-
describe DevTools, exclusive: {browser: %i[chrome edge firefox firefox_nightly]} do
24+
describe DevTools, exclusive: {browser: %i[chrome edge firefox]} do
2525
after { reset_driver! }
2626

2727
it 'sends commands' do
@@ -47,7 +47,7 @@ module WebDriver
4747
}.to raise_error(RuntimeError, "This is fine!")
4848
end
4949

50-
context 'authentication', except: {browser: %i[firefox firefox_nightly],
50+
context 'authentication', except: {browser: :firefox,
5151
reason: 'Fetch.enable is not yet supported'} do
5252
let(:username) { SpecSupport::RackServer::TestApp::BASIC_AUTH_CREDENTIALS.first }
5353
let(:password) { SpecSupport::RackServer::TestApp::BASIC_AUTH_CREDENTIALS.last }
@@ -95,7 +95,7 @@ module WebDriver
9595
)
9696
end
9797

98-
it 'notifies about document log messages', except: {browser: %i[firefox firefox_nightly],
98+
it 'notifies about document log messages', except: {browser: :firefox,
9999
reason: 'Firefox & Chrome parse document differently'} do
100100
logs = []
101101
driver.on_log_event(:console) { |log| logs.push(log) }
@@ -109,7 +109,7 @@ module WebDriver
109109
)
110110
end
111111

112-
it 'notifies about document log messages', only: {browser: %i[firefox firefox_nightly],
112+
it 'notifies about document log messages', only: {browser: :firefox,
113113
reason: 'Firefox & Chrome parse document differently'} do
114114
logs = []
115115
driver.on_log_event(:console) { |log| logs.push(log) }
@@ -136,7 +136,7 @@ module WebDriver
136136
expect(exception.stacktrace).not_to be_empty
137137
end
138138

139-
it 'notifies about DOM mutations', except: {browser: %i[firefox firefox_nightly],
139+
it 'notifies about DOM mutations', except: {browser: :firefox,
140140
reason: 'Runtime.addBinding not yet supported'} do
141141
mutations = []
142142
driver.on_log_event(:mutation) { |mutation| mutations.push(mutation) }
@@ -152,7 +152,7 @@ module WebDriver
152152
expect(mutation.old_value).to eq('display:none;')
153153
end
154154

155-
context 'network interception', except: {browser: %i[firefox firefox_nightly],
155+
context 'network interception', except: {browser: :firefox,
156156
reason: 'Fetch.enable is not yet supported'} do
157157
it 'continues requests' do
158158
requests = []
@@ -202,7 +202,7 @@ module WebDriver
202202
end
203203
end
204204

205-
context 'script pinning', except: {browser: %i[firefox firefox_nightly]} do
205+
context 'script pinning', except: {browser: :firefox} do
206206
before do
207207
driver.navigate.to url_for('xhtmlTest.html')
208208
end

rb/spec/integration/selenium/webdriver/element_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ module WebDriver
102102
end
103103

104104
# https://github.com/mozilla/geckodriver/issues/245
105-
it 'should send key presses chords', except: {browser: %i[firefox firefox_nightly safari safari_preview]} do
105+
it 'should send key presses chords', except: {browser: %i[firefox safari safari_preview]} do
106106
driver.navigate.to url_for('javascriptPage.html')
107107
key_reporter = driver.find_element(id: 'keyReporter')
108108

rb/spec/integration/selenium/webdriver/manager_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ module WebDriver
121121
end
122122

123123
it 'should not add secure cookie when http',
124-
except: [{browser: %i[firefox firefox_nightly],
124+
except: [{browser: :firefox,
125125
reason: 'https://github.com/mozilla/geckodriver/issues/1840'},
126126
{browser: %i[chrome edge],
127127
reason: 'https://bugs.chromium.org/p/chromium/issues/detail?id=1177877#c7'}] do
@@ -145,15 +145,15 @@ module WebDriver
145145
end
146146

147147
context 'sameSite' do
148-
it 'should allow adding with value Strict', only: {browser: %i[chrome edge firefox firefox_nightly]} do
148+
it 'should allow adding with value Strict', only: {browser: %i[chrome edge firefox]} do
149149
driver.manage.add_cookie name: 'samesite',
150150
value: 'strict',
151151
same_site: 'Strict'
152152

153153
expect(driver.manage.cookie_named('samesite')[:same_site]).to eq('Strict')
154154
end
155155

156-
it 'should allow adding with value Lax', only: {browser: %i[chrome edge firefox firefox_nightly]} do
156+
it 'should allow adding with value Lax', only: {browser: %i[chrome edge firefox]} do
157157
driver.manage.add_cookie name: 'samesite',
158158
value: 'lax',
159159
same_site: 'Lax'
@@ -174,7 +174,7 @@ module WebDriver
174174
end
175175

176176
it 'should not allow adding with value None when secure is false',
177-
except: [{browser: %i[firefox firefox_nightly],
177+
except: [{browser: :firefox,
178178
reason: "https://github.com/mozilla/geckodriver/issues/1842"},
179179
{browser: %i[safari safari_preview]}] do
180180
expect {

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,6 @@ def create_firefox_driver(**opts)
189189
WebDriver::Driver.for(:firefox, options: options, **opts)
190190
end
191191

192-
def create_firefox_nightly_driver(**opts)
193-
options = create_firefox_options(opts.delete(:options))
194-
options.binary = ENV['FIREFOX_NIGHTLY_BINARY'] if ENV.key?('FIREFOX_NIGHTLY_BINARY')
195-
WebDriver::Driver.for(:firefox, options: options, **opts)
196-
end
197-
198192
def create_firefox_options(options)
199193
options ||= WebDriver::Options.firefox
200194
options.web_socket_url = true

0 commit comments

Comments
 (0)