Skip to content

Commit dd8f004

Browse files
committed
rb - marionette spec updates
1 parent c5aeece commit dd8f004

File tree

10 files changed

+14
-12
lines changed

10 files changed

+14
-12
lines changed

rb/lib/selenium/webdriver/firefox/binary.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def path
121121
when :windows
122122
windows_path
123123
when :linux, :unix
124-
Platform.find_binary("firefox3", "firefox2", "firefox") || "/usr/bin/firefox"
124+
Platform.find_binary('firefox3', 'firefox2', 'firefox') || '/usr/bin/firefox'
125125
else
126126
raise Error::WebDriverError, "unknown platform: #{Platform.os}"
127127
end

rb/lib/selenium/webdriver/remote/w3c_bridge.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def dismiss_alert
165165
end
166166

167167
def alert=(keys)
168-
execute :sendAlertText, {}, {handler: 'prompt', message: keys}
168+
execute :sendAlertText, {}, {handler: 'prompt', text: keys}
169169
end
170170

171171
def alert_text

rb/lib/selenium/webdriver/support/color.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def self.from_string(str)
6666
array = [Regexp.last_match(1), Regexp.last_match(2), Regexp.last_match(3)]
6767
new(*array.map { |e| (e * 2).to_i(16) })
6868
when HSL_PATTERN, HSLA_PATTERN
69-
from_hsl($1, $2, $3, $4)
69+
from_hsl(Regexp.last_match(1), Regexp.last_match(2), Regexp.last_match(3), Regexp.last_match(4))
7070
else
7171
raise ArgumentError, "could not convert #{str.inspect} into color"
7272
end

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ module WebDriver
7676
end
7777

7878
# PhantomJS on windows issue: https://github.com/ariya/phantomjs/issues/10993
79+
# Marionette BUG - https://bugzilla.mozilla.org/show_bug.cgi?id=1260233
7980
not_compliant_on browser: [:android, :iphone, :safari, :edge, :marionette, :phantomjs] do
8081
it 'should handle file uploads' do
8182
driver.navigate.to url_for('formPage.html')
@@ -168,6 +169,7 @@ module WebDriver
168169
expect(size.height).to be > 0
169170
end
170171

172+
# Marionette - Waiting on implementation in httpd after spec section rewrite
171173
not_compliant_on browser: [:safari, :marionette] do
172174
it 'should drag and drop' do
173175
driver.navigate.to url_for('dragAndDropTest.html')

rb/spec/integration/selenium/webdriver/keyboard_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-
# Marionette BUG - Interactions Not Supported
24+
# Marionette - Waiting on implementation in httpd after spec section rewrite
2525
# Firefox BUG - https://github.com/SeleniumHQ/selenium/issues/1792
2626
not_compliant_on browser: [:android, :iphone, :safari, :marionette, :firefox] do
2727
describe Keyboard do

rb/spec/integration/selenium/webdriver/mouse_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-
# Marionette BUG - Interactions Not Supported
24+
# Marionette - Waiting on implementation in httpd after spec section rewrite
2525
not_compliant_on browser: [:android, :iphone, :safari, :marionette] do
2626
describe Mouse do
2727
it 'clicks an element' do

rb/spec/integration/selenium/webdriver/options_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ module WebDriver
9595
end
9696
end
9797

98-
# Marionette BUG - Failed to convert expiry to Date
98+
# Marionette BUG - https://bugzilla.mozilla.org/show_bug.cgi?id=1256007
9999
not_compliant_on browser: [:android, :iphone, :safari, :marionette] do
100100
it 'should use DateTime for expires' do
101101
driver.navigate.to url_for('xhtmlTest.html')

rb/spec/integration/selenium/webdriver/target_locator_spec.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ module WebDriver
131131
expect(driver.title).to eq('XHTML Test Page')
132132
end
133133

134-
# Marionette BUG: Automatically switches browsing context to new window when it opens.
134+
# Marionette BUG - https://bugzilla.mozilla.org/show_bug.cgi?id=1280517
135135
not_compliant_on browser: [:marionette, :ie] do
136136
context 'with more than two windows' do
137137
it 'should close current window when more than two windows exist' do
@@ -252,10 +252,7 @@ module WebDriver
252252
end
253253
end
254254

255-
# Marionette BUG - http://www.w3.org/TR/webdriver/#send-alert-text
256-
# Says message should be an array (I think), but we're getting
257-
# InvalidArgumentError: 'message' not a string
258-
# When trying a string, error: keysToSend.join is not a function
255+
# Marionette BUG - https://bugzilla.mozilla.org/show_bug.cgi?id=1255906
259256
# Edge Under Consideration - https://dev.windows.com/en-us/microsoft-edge/platform/status/webdriver/details/
260257
not_compliant_on browser: [:marionette, :edge] do
261258
it 'allows the user to set the value of a prompt' do
@@ -301,6 +298,7 @@ module WebDriver
301298
end
302299
end
303300

301+
# Marionette BUG - https://bugzilla.mozilla.org/show_bug.cgi?id=1279211
304302
not_compliant_on browser: :marionette do
305303
it 'raises an UnhandledAlertError if an alert has not been dealt with' do
306304
driver.navigate.to url_for('alerts.html')

rb/spec/integration/selenium/webdriver/window_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ module WebDriver
8989
end
9090
end
9191

92+
# Marionette - https://bugzilla.mozilla.org/show_bug.cgi?id=1189749
9293
compliant_on browser: [:marionette, :edge] do
9394
# Edge: Not Yet - https://dev.windows.com/en-us/microsoft-edge/platform/status/webdriver/details/
9495
not_compliant_on browser: [:marionette, :edge] do

rb/spec/unit/selenium/webdriver/remote/bridge_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ module Remote
3131
request_body = JSON.generate(sessionId: '11123', value: {})
3232
headers = {'Content-Type' => 'application/json'}
3333
stub_request(:post, 'http://127.0.0.1:4444/wd/hub/session').to_return(
34-
status: 200, body: request_body, headers: headers)
34+
status: 200, body: request_body, headers: headers
35+
)
3536

3637
bridge = Bridge.new
3738
expect { bridge.upload('NotAFile') }.to raise_error(Error::WebDriverError)

0 commit comments

Comments
 (0)