Skip to content

Commit e09e769

Browse files
committed
rb - remove deprecated mobile classes (Issue #2476)
1 parent fd84a1b commit e09e769

File tree

18 files changed

+193
-638
lines changed

18 files changed

+193
-638
lines changed

rb/CHANGES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ Firefox:
1818
Safari:
1919
* Initial support for Apple's Safari Driver in Sierra (issue #2475)
2020

21+
Android and iPhone:
22+
* Remove support for deprecated classes (Issue #2476)
23+
2124
2.53.0 (2016-03-15)
2225
===================
2326

rb/lib/selenium/webdriver.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ module WebDriver
3131
Dimension = Struct.new(:width, :height)
3232
Location = Struct.new(:latitude, :longitude, :altitude)
3333

34-
autoload :Android, 'selenium/webdriver/android'
3534
autoload :Chrome, 'selenium/webdriver/chrome'
3635
autoload :Edge, 'selenium/webdriver/edge'
3736
autoload :Firefox, 'selenium/webdriver/firefox'
3837
autoload :IE, 'selenium/webdriver/ie'
39-
autoload :IPhone, 'selenium/webdriver/iphone'
4038
autoload :PhantomJS, 'selenium/webdriver/phantomjs'
4139
autoload :Remote, 'selenium/webdriver/remote'
4240
autoload :Safari, 'selenium/webdriver/safari'
@@ -51,7 +49,7 @@ def self.root
5149
#
5250
# Create a new Driver instance with the correct bridge for the given browser
5351
#
54-
# @param browser [:ie, :internet_explorer, :edge, :remote, :chrome, :firefox, :ff, :android, :iphone, :phantomjs, :safari]
52+
# @param browser [:ie, :internet_explorer, :edge, :remote, :chrome, :firefox, :ff, :phantomjs, :safari]
5553
# the driver type to use
5654
# @param *rest
5755
# arguments passed to Bridge.new
@@ -63,8 +61,6 @@ def self.root
6361
# @see Selenium::WebDriver::IE::Bridge
6462
# @see Selenium::WebDriver::Edge::Bridge
6563
# @see Selenium::WebDriver::Chrome::Bridge
66-
# @see Selenium::WebDriver::Android::Bridge
67-
# @see Selenium::WebDriver::IPhone::Bridge
6864
# @see Selenium::WebDriver::PhantomJS::Bridge
6965
# @see Selenium::WebDriver::Safari::Bridge
7066
#

rb/lib/selenium/webdriver/android.rb

Lines changed: 0 additions & 27 deletions
This file was deleted.

rb/lib/selenium/webdriver/android/bridge.rb

Lines changed: 0 additions & 65 deletions
This file was deleted.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ def for(browser, opts = {})
6262
Chrome::Bridge.new(opts)
6363
when :edge
6464
Edge::Bridge.new(opts)
65-
when :android
66-
Android::Bridge.new(opts)
67-
when :iphone
68-
IPhone::Bridge.new(opts)
6965
when :phantomjs
7066
PhantomJS::Bridge.new(opts)
7167
when :safari

rb/lib/selenium/webdriver/iphone.rb

Lines changed: 0 additions & 27 deletions
This file was deleted.

rb/lib/selenium/webdriver/iphone/bridge.rb

Lines changed: 0 additions & 64 deletions
This file was deleted.

rb/lib/selenium/webdriver/remote/bridge.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ def session_storage_size
327327
end
328328

329329
def location
330-
obj = execute(:getLocation) || {} # android returns null
330+
obj = execute(:getLocation) || {}
331331
Location.new obj['latitude'], obj['longitude'], obj['altitude']
332332
end
333333

rb/lib/selenium/webdriver/remote/capabilities.rb

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,6 @@ class Capabilities
5959
#
6060

6161
class << self
62-
def android(opts = {})
63-
new({
64-
browser_name: 'android',
65-
platform: :android,
66-
javascript_enabled: true,
67-
rotatable: true,
68-
takes_screenshot: true
69-
}.merge(opts))
70-
end
71-
7262
def chrome(opts = {})
7363
new({
7464
browser_name: 'chrome',
@@ -118,22 +108,6 @@ def internet_explorer(opts = {})
118108
end
119109
alias_method :ie, :internet_explorer
120110

121-
def iphone(opts = {})
122-
new({
123-
browser_name: 'iPhone',
124-
platform: :mac,
125-
javascript_enabled: true
126-
}.merge(opts))
127-
end
128-
129-
def ipad(opts = {})
130-
new({
131-
browser_name: 'iPad',
132-
platform: :mac,
133-
javascript_enabled: true
134-
}.merge(opts))
135-
end
136-
137111
def phantomjs(opts = {})
138112
new({
139113
browser_name: 'phantomjs',

0 commit comments

Comments
 (0)