Skip to content

Commit 21fe296

Browse files
titusfortnertitusfortner
committed
[rb] default to using Options not Capabilities when not specified
1 parent d338de3 commit 21fe296

11 files changed

Lines changed: 19 additions & 17 deletions

File tree

‎rb/lib/selenium/webdriver/chrome/driver.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def process_options(options, capabilities)
5151
if options && !options.is_a?(Options)
5252
raise ArgumentError, ":options must be an instance of #{Options}"
5353
elsif options.nil? && capabilities.nil?
54-
capabilities = Remote::Capabilities.chrome
54+
options = Options.new
5555
end
5656

5757
super(options, capabilities)

‎rb/lib/selenium/webdriver/common/driver.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def process_options(options, capabilities)
326326
def generate_capabilities(capabilities)
327327
Array(capabilities).map { |cap|
328328
if cap.is_a? Symbol
329-
cap = Remote::Capabilities.send(cap)
329+
cap = WebDriver::Options.send(cap)
330330
elsif !cap.respond_to? :as_json
331331
msg = ":capabilities parameter only accepts objects responding to #as_json which #{cap.class} does not"
332332
raise ArgumentError, msg

‎rb/lib/selenium/webdriver/edge/driver.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def process_options(options, capabilities)
5151
if options && !options.is_a?(Options)
5252
raise ArgumentError, ":options must be an instance of #{Options}"
5353
elsif options.nil? && capabilities.nil?
54-
capabilities = Remote::Capabilities.edge
54+
options = Options.new
5555
end
5656

5757
super(options, capabilities)

‎rb/lib/selenium/webdriver/firefox/driver.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def process_options(options, capabilities)
7070
if options && !options.is_a?(Options)
7171
raise ArgumentError, ":options must be an instance of #{Options}"
7272
elsif options.nil? && capabilities.nil?
73-
capabilities = Remote::Capabilities.firefox
73+
options = Options.new
7474
end
7575

7676
super(options, capabilities)

‎rb/lib/selenium/webdriver/ie/driver.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def process_options(options, capabilities)
4848
if options && !options.is_a?(Options)
4949
raise ArgumentError, ":options must be an instance of #{Options}"
5050
elsif options.nil? && capabilities.nil?
51-
capabilities = Remote::Capabilities.ie
51+
options = Options.new
5252
end
5353

5454
super(options, capabilities)

‎rb/lib/selenium/webdriver/safari/driver.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def process_options(options, capabilities)
4949
if options && !options.is_a?(Options)
5050
raise ArgumentError, ":options must be an instance of #{Options}"
5151
elsif options.nil? && capabilities.nil?
52-
capabilities = Remote::Capabilities.safari
52+
options = Options.new
5353
end
5454

5555
super(options, capabilities)

‎rb/spec/unit/selenium/webdriver/chrome/driver_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module Chrome
3232
end
3333

3434
def expect_request(body: nil, endpoint: nil)
35-
body = (body || {capabilities: {alwaysMatch: {browserName: "chrome"}}}).to_json
35+
body = (body || {capabilities: {alwaysMatch: {browserName: "chrome", 'goog:chromeOptions': {}}}}).to_json
3636
endpoint ||= "#{service_manager.uri}/session"
3737
stub_request(:post, endpoint).with(body: body).to_return(valid_response)
3838
end
@@ -70,7 +70,7 @@ def expect_request(body: nil, endpoint: nil)
7070

7171
context 'with :capabilities' do
7272
it 'accepts value as a Symbol' do
73-
expect_request(body: {capabilities: {alwaysMatch: {browserName: "chrome"}}})
73+
expect_request
7474
expect { Driver.new(capabilities: :chrome) }.not_to raise_exception
7575
end
7676

‎rb/spec/unit/selenium/webdriver/edge/driver_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module Edge
3232
end
3333

3434
def expect_request(body: nil, endpoint: nil)
35-
body = (body || {capabilities: {alwaysMatch: {browserName: "MicrosoftEdge"}}}).to_json
35+
body = (body || {capabilities: {alwaysMatch: {browserName: "MicrosoftEdge", 'ms:edgeOptions': {}}}}).to_json
3636
endpoint ||= "#{service_manager.uri}/session"
3737
stub_request(:post, endpoint).with(body: body).to_return(valid_response)
3838
end
@@ -75,7 +75,7 @@ def expect_request(body: nil, endpoint: nil)
7575

7676
context 'with :capabilities' do
7777
it 'accepts value as a Symbol' do
78-
expect_request(body: {capabilities: {alwaysMatch: {browserName: "MicrosoftEdge"}}})
78+
expect_request
7979
expect { Driver.new(capabilities: :edge) }.not_to raise_exception
8080
end
8181

‎rb/spec/unit/selenium/webdriver/firefox/driver_spec.rb‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ module Firefox
3232
end
3333

3434
def expect_request(body: nil, endpoint: nil)
35-
body = (body || {capabilities: {alwaysMatch: {browserName: "firefox"}}}).to_json
35+
body = (body || {capabilities: {alwaysMatch: {acceptInsecureCerts: true,
36+
browserName: "firefox",
37+
'moz:firefoxOptions': {},
38+
'moz:debuggerAddress': true}}}).to_json
3639
endpoint ||= "#{service_manager.uri}/session"
3740
stub_request(:post, endpoint).with(body: body).to_return(valid_response)
3841
end
@@ -72,7 +75,7 @@ def expect_request(body: nil, endpoint: nil)
7275

7376
context 'with :capabilities' do
7477
it 'accepts value as a Symbol' do
75-
expect_request(body: {capabilities: {alwaysMatch: {browserName: "firefox"}}})
78+
expect_request
7679
expect { Driver.new(capabilities: :firefox) }.not_to raise_exception
7780
end
7881

‎rb/spec/unit/selenium/webdriver/ie/driver_spec.rb‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module IE
3333

3434
def expect_request(body: nil, endpoint: nil)
3535
body = (body || {capabilities: {alwaysMatch: {browserName: "internet explorer",
36-
platformName: 'windows'}}}).to_json
36+
'se:ieOptions': {nativeEvents: true}}}}).to_json
3737
endpoint ||= "#{service_manager.uri}/session"
3838
stub_request(:post, endpoint).with(body: body).to_return(valid_response)
3939
end
@@ -74,8 +74,7 @@ def expect_request(body: nil, endpoint: nil)
7474

7575
context 'with :capabilities' do
7676
it 'accepts value as a Symbol' do
77-
expect_request(body: {capabilities: {alwaysMatch: {browserName: "internet explorer",
78-
platformName: 'windows'}}})
77+
expect_request
7978
expect { Driver.new(capabilities: :ie) }.not_to raise_exception
8079
end
8180

0 commit comments

Comments
 (0)