Skip to content

Commit

Permalink
rb: remove support for Opera
Browse files Browse the repository at this point in the history
Opera support for the Ruby bindings is now completely gone.
  • Loading branch information
andreastt committed Feb 28, 2015
1 parent c8725cf commit dbb434d
Show file tree
Hide file tree
Showing 16 changed files with 10 additions and 354 deletions.
25 changes: 0 additions & 25 deletions rb/build.desc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ rubygem(
"//rb:firefox",
"//rb:ie",
"//rb:iphone",
"//rb:opera",
"//rb:phantomjs",
"//rb:remote",
"//rb:rc-client",
Expand Down Expand Up @@ -154,29 +153,6 @@ ruby_test(name = "iphone",
deps = [ ":iphone" ]
)

ruby_library(name = "opera",
srcs = [
"lib/selenium/webdriver/opera/**/*.rb",
"lib/selenium/webdriver/opera.rb"
],
deps = [
":common",
":remote"
]
)

ruby_test(name = "opera",
srcs = [
"spec/integration/selenium/webdriver/*_spec.rb",
"spec/integration/selenium/webdriver/opera/**/*_spec.rb"
],
include = ["rb/spec/integration", "build/rb/lib"],
deps = [
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
":opera"
]
)

ruby_library(name = "phantomjs",
srcs = [
"lib/selenium/webdriver/phantomjs/**/*.rb",
Expand Down Expand Up @@ -272,7 +248,6 @@ ruby_test(name = "unit",
":firefox",
":ie",
":iphone",
":opera",
":remote",
":safari",
":phantomjs",
Expand Down
4 changes: 1 addition & 3 deletions rb/lib/selenium/webdriver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ module WebDriver
autoload :Firefox, 'selenium/webdriver/firefox'
autoload :IE, 'selenium/webdriver/ie'
autoload :IPhone, 'selenium/webdriver/iphone'
autoload :Opera, 'selenium/webdriver/opera'
autoload :PhantomJS, 'selenium/webdriver/phantomjs'
autoload :Remote, 'selenium/webdriver/remote'
autoload :Safari, 'selenium/webdriver/safari'
Expand All @@ -34,7 +33,7 @@ def self.root
#
# Create a new Driver instance with the correct bridge for the given browser
#
# @param browser [:ie, :internet_explorer, :remote, :chrome, :firefox, :ff, :android, :iphone, :opera, :phantomjs, :safari]
# @param browser [:ie, :internet_explorer, :remote, :chrome, :firefox, :ff, :android, :iphone, :phantomjs, :safari]
# the driver type to use
# @param *rest
# arguments passed to Bridge.new
Expand All @@ -47,7 +46,6 @@ def self.root
# @see Selenium::WebDriver::Chrome::Bridge
# @see Selenium::WebDriver::Android::Bridge
# @see Selenium::WebDriver::IPhone::Bridge
# @see Selenium::WebDriver::Opera::Bridge
# @see Selenium::WebDriver::PhantomJS::Bridge
# @see Selenium::WebDriver::Safari::Bridge
#
Expand Down
2 changes: 0 additions & 2 deletions rb/lib/selenium/webdriver/common/driver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ def for(browser, opts = {})
Android::Bridge.new(opts)
when :iphone
IPhone::Bridge.new(opts)
when :opera
Opera::Bridge.new(opts)
when :phantomjs
PhantomJS::Bridge.new(opts)
when :safari
Expand Down
24 changes: 0 additions & 24 deletions rb/lib/selenium/webdriver/opera.rb

This file was deleted.

112 changes: 0 additions & 112 deletions rb/lib/selenium/webdriver/opera/bridge.rb

This file was deleted.

49 changes: 0 additions & 49 deletions rb/lib/selenium/webdriver/opera/service.rb

This file was deleted.

9 changes: 0 additions & 9 deletions rb/lib/selenium/webdriver/remote/capabilities.rb
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,6 @@ def ipad(opts = {})
}.merge(opts))
end

def opera(opts = {})
new({
:browser_name => "opera",
:javascript_enabled => true,
:takes_screenshot => true,
:css_selectors_enabled => true
}.merge(opts))
end

def phantomjs(opts = {})
new({
:browser_name => "phantomjs",
Expand Down
6 changes: 3 additions & 3 deletions rb/spec/integration/selenium/webdriver/driver_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
end
end

not_compliant_on :browser => [:opera, :iphone, :safari] do
not_compliant_on :browser => [ :iphone, :safari] do
it "should save a screenshot" do
driver.navigate.to url_for("xhtmlTest.html")
path = "screenshot_tmp.png"
Expand Down Expand Up @@ -160,7 +160,7 @@
element.text.should == "Foo"
end

not_compliant_on :browser => [:opera, :android] do
not_compliant_on :browser => [:android] do
it "should unwrap elements in deep objects" do
driver.navigate.to url_for("xhtmlTest.html")
result = driver.execute_script(<<-SCRIPT)
Expand Down Expand Up @@ -236,7 +236,7 @@
end
end

not_compliant_on :browser => [:opera, :iphone, :android, :phantomjs] do
not_compliant_on :browser => [:iphone, :android, :phantomjs] do
describe "execute async script" do
before {
driver.manage.timeouts.script_timeout = 0
Expand Down
2 changes: 1 addition & 1 deletion rb/spec/integration/selenium/webdriver/element_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
end
end

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

Expand Down
47 changes: 0 additions & 47 deletions rb/spec/integration/selenium/webdriver/opera/driver_spec.rb

This file was deleted.

4 changes: 2 additions & 2 deletions rb/spec/integration/selenium/webdriver/spec_support/guards.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ def current_env
# not_compliant_on :browser => [:firefox, :chrome]
# - guard this spec for both firefox and chrome
#
# not_compliant_on {:browser => :chrome, :platform => :macosx}, {:browser => :opera}
# - guard this spec for Chrome on OSX and Opera on any OS
# not_compliant_on {:browser => :chrome, :platform => :macosx}, {:browser => :firefox}
# - guard this spec for Chrome on OSX and Firefox on any OS

def env_matches?(opts)
res = opts.any? { |env|
Expand Down
Loading

0 comments on commit dbb434d

Please sign in to comment.