Skip to content

Commit dbb434d

Browse files
committed
rb: remove support for Opera
Opera support for the Ruby bindings is now completely gone.
1 parent c8725cf commit dbb434d

File tree

16 files changed

+10
-354
lines changed

16 files changed

+10
-354
lines changed

rb/build.desc

-25
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ rubygem(
88
"//rb:firefox",
99
"//rb:ie",
1010
"//rb:iphone",
11-
"//rb:opera",
1211
"//rb:phantomjs",
1312
"//rb:remote",
1413
"//rb:rc-client",
@@ -154,29 +153,6 @@ ruby_test(name = "iphone",
154153
deps = [ ":iphone" ]
155154
)
156155

157-
ruby_library(name = "opera",
158-
srcs = [
159-
"lib/selenium/webdriver/opera/**/*.rb",
160-
"lib/selenium/webdriver/opera.rb"
161-
],
162-
deps = [
163-
":common",
164-
":remote"
165-
]
166-
)
167-
168-
ruby_test(name = "opera",
169-
srcs = [
170-
"spec/integration/selenium/webdriver/*_spec.rb",
171-
"spec/integration/selenium/webdriver/opera/**/*_spec.rb"
172-
],
173-
include = ["rb/spec/integration", "build/rb/lib"],
174-
deps = [
175-
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
176-
":opera"
177-
]
178-
)
179-
180156
ruby_library(name = "phantomjs",
181157
srcs = [
182158
"lib/selenium/webdriver/phantomjs/**/*.rb",
@@ -272,7 +248,6 @@ ruby_test(name = "unit",
272248
":firefox",
273249
":ie",
274250
":iphone",
275-
":opera",
276251
":remote",
277252
":safari",
278253
":phantomjs",

rb/lib/selenium/webdriver.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ module WebDriver
1919
autoload :Firefox, 'selenium/webdriver/firefox'
2020
autoload :IE, 'selenium/webdriver/ie'
2121
autoload :IPhone, 'selenium/webdriver/iphone'
22-
autoload :Opera, 'selenium/webdriver/opera'
2322
autoload :PhantomJS, 'selenium/webdriver/phantomjs'
2423
autoload :Remote, 'selenium/webdriver/remote'
2524
autoload :Safari, 'selenium/webdriver/safari'
@@ -34,7 +33,7 @@ def self.root
3433
#
3534
# Create a new Driver instance with the correct bridge for the given browser
3635
#
37-
# @param browser [:ie, :internet_explorer, :remote, :chrome, :firefox, :ff, :android, :iphone, :opera, :phantomjs, :safari]
36+
# @param browser [:ie, :internet_explorer, :remote, :chrome, :firefox, :ff, :android, :iphone, :phantomjs, :safari]
3837
# the driver type to use
3938
# @param *rest
4039
# arguments passed to Bridge.new
@@ -47,7 +46,6 @@ def self.root
4746
# @see Selenium::WebDriver::Chrome::Bridge
4847
# @see Selenium::WebDriver::Android::Bridge
4948
# @see Selenium::WebDriver::IPhone::Bridge
50-
# @see Selenium::WebDriver::Opera::Bridge
5149
# @see Selenium::WebDriver::PhantomJS::Bridge
5250
# @see Selenium::WebDriver::Safari::Bridge
5351
#

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

-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ def for(browser, opts = {})
3939
Android::Bridge.new(opts)
4040
when :iphone
4141
IPhone::Bridge.new(opts)
42-
when :opera
43-
Opera::Bridge.new(opts)
4442
when :phantomjs
4543
PhantomJS::Bridge.new(opts)
4644
when :safari

rb/lib/selenium/webdriver/opera.rb

-24
This file was deleted.

rb/lib/selenium/webdriver/opera/bridge.rb

-112
This file was deleted.

rb/lib/selenium/webdriver/opera/service.rb

-49
This file was deleted.

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

-9
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,6 @@ def ipad(opts = {})
108108
}.merge(opts))
109109
end
110110

111-
def opera(opts = {})
112-
new({
113-
:browser_name => "opera",
114-
:javascript_enabled => true,
115-
:takes_screenshot => true,
116-
:css_selectors_enabled => true
117-
}.merge(opts))
118-
end
119-
120111
def phantomjs(opts = {})
121112
new({
122113
:browser_name => "phantomjs",

rb/spec/integration/selenium/webdriver/driver_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
end
2323
end
2424

25-
not_compliant_on :browser => [:opera, :iphone, :safari] do
25+
not_compliant_on :browser => [ :iphone, :safari] do
2626
it "should save a screenshot" do
2727
driver.navigate.to url_for("xhtmlTest.html")
2828
path = "screenshot_tmp.png"
@@ -160,7 +160,7 @@
160160
element.text.should == "Foo"
161161
end
162162

163-
not_compliant_on :browser => [:opera, :android] do
163+
not_compliant_on :browser => [:android] do
164164
it "should unwrap elements in deep objects" do
165165
driver.navigate.to url_for("xhtmlTest.html")
166166
result = driver.execute_script(<<-SCRIPT)
@@ -236,7 +236,7 @@
236236
end
237237
end
238238

239-
not_compliant_on :browser => [:opera, :iphone, :android, :phantomjs] do
239+
not_compliant_on :browser => [:iphone, :android, :phantomjs] do
240240
describe "execute async script" do
241241
before {
242242
driver.manage.timeouts.script_timeout = 0

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
end
2828
end
2929

30-
not_compliant_on :browser => [:opera, :android, :iphone, :safari] do
30+
not_compliant_on :browser => [:android, :iphone, :safari] do
3131
it "should handle file uploads" do
3232
driver.navigate.to url_for("formPage.html")
3333

rb/spec/integration/selenium/webdriver/opera/driver_spec.rb

-47
This file was deleted.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ def current_env
6565
# not_compliant_on :browser => [:firefox, :chrome]
6666
# - guard this spec for both firefox and chrome
6767
#
68-
# not_compliant_on {:browser => :chrome, :platform => :macosx}, {:browser => :opera}
69-
# - guard this spec for Chrome on OSX and Opera on any OS
68+
# not_compliant_on {:browser => :chrome, :platform => :macosx}, {:browser => :firefox}
69+
# - guard this spec for Chrome on OSX and Firefox on any OS
7070

7171
def env_matches?(opts)
7272
res = opts.any? { |env|

0 commit comments

Comments
 (0)