javascript/webdriver: remove Opera support

SeleniumHQ · Feb 28, 2015 · af8b8ee · af8b8ee · mathiasbynens · Mar 1, 2015
1 parent c049af9
commit af8b8ee
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 109 deletions.
diff --git a/javascript/webdriver/atoms/element.js b/javascript/webdriver/atoms/element.js
@@ -36,7 +36,7 @@ goog.require('webdriver.Key');
  */
 webdriver.atoms.element.isSelected = function(element) {
   // Although this method looks unloved, its compiled form is used by
-  // the Chrome and OperaDrivers.
+  // Chrome.
   if (!bot.dom.isSelectable(element)) {
     return false;
   }

diff --git a/javascript/webdriver/browser/browser.js b/javascript/webdriver/browser/browser.js
@@ -30,7 +30,6 @@ webdriver.browser.BROWSER_NAME_ = (function() {
   map[goog.userAgent.IE] = webdriver.Browser.INTERNET_EXPLORER;
   map[goog.userAgent.product.IPAD] = webdriver.Browser.IPAD;
   map[goog.userAgent.product.IPHONE] = webdriver.Browser.IPHONE;
-  map[goog.userAgent.OPERA] = webdriver.Browser.OPERA;
   map[goog.userAgent.product.SAFARI] = webdriver.Browser.SAFARI;
   return map[true] || '';
 })();

diff --git a/javascript/webdriver/capabilities.js b/javascript/webdriver/capabilities.js
@@ -38,7 +38,6 @@ webdriver.Browser = {
   INTERNET_EXPLORER: 'internet explorer',
   IPAD: 'iPad',
   IPHONE: 'iPhone',
-  OPERA: 'opera',
   PHANTOM_JS: 'phantomjs',
   SAFARI: 'safari',
   HTMLUNIT: 'htmlunit'
@@ -237,15 +236,6 @@ webdriver.Capabilities.iphone = function() {
 };
 
 
-/**
- * @return {!webdriver.Capabilities} A basic set of capabilities for Opera.
- */
-webdriver.Capabilities.opera = function() {
-  return new webdriver.Capabilities().
-      set(webdriver.Capability.BROWSER_NAME, webdriver.Browser.OPERA);
-};
-
-
 /**
  * @return {!webdriver.Capabilities} A basic set of capabilities for
  *     PhantomJS.

diff --git a/javascript/webdriver/http/corsclient.js b/javascript/webdriver/http/corsclient.js
@@ -48,10 +48,10 @@ goog.require('webdriver.http.Response');
  *     This limitation appears to be intentional and is documented in WebKit's
  *     Layout tests:
  *     //LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects.html
- *   <li>If the server does not return a 2xx response, IE and Opera's
- *     implementations will fire the XDomainRequest/XMLHttpRequest object's
+ *   <li>If the server does not return a 2xx response, IE
+ *     implementation will fire the XDomainRequest/XMLHttpRequest object's
  *     onerror handler, but without the corresponding response text returned by
- *     the server. This renders IE and Opera incapable of handling command
+ *     the server. This renders IE incapable of handling command
  *     failures in the standard JSON protocol.
  * </ul>
  *

diff --git a/javascript/webdriver/stacktrace.js b/javascript/webdriver/stacktrace.js
@@ -60,8 +60,7 @@ webdriver.stacktrace.Snapshot = function(opt_slice) {
   }
 
   /**
-   * The error's stacktrace.  This must be accessed immediately to ensure Opera
-   * computes the context correctly.
+   * The error's stacktrace.
    * @private {string}
    */
   this.stack_ = webdriver.stacktrace.getStack(error);
@@ -392,40 +391,6 @@ webdriver.stacktrace.FIREFOX_STACK_FRAME_REGEXP_ = new RegExp('^' +
     '(?::0|' + webdriver.stacktrace.URL_PATTERN_ + ')$');
 
 
-/**
- * RegExp pattern for an anonymous function call in an Opera stack frame.
- * Creates 2 (optional) submatches: the context object and function name.
- * @private {string}
- * @const
- */
-webdriver.stacktrace.OPERA_ANONYMOUS_FUNCTION_NAME_PATTERN_ =
-    '<anonymous function(?:\\: ' +
-    webdriver.stacktrace.QUALIFIED_NAME_PATTERN_ + ')?>';
-
-
-/**
- * RegExp pattern for a function call in an Opera stack frame.
- * Creates 3 (optional) submatches: the function name (if not anonymous),
- * the aliased context object and the function name (if anonymous).
- * @private {string}
- * @const
- */
-webdriver.stacktrace.OPERA_FUNCTION_CALL_PATTERN_ =
-    '(?:(?:(' + webdriver.stacktrace.IDENTIFIER_PATTERN_ + ')|' +
-    webdriver.stacktrace.OPERA_ANONYMOUS_FUNCTION_NAME_PATTERN_ +
-    ')(?:\\(.*\\)))?@';
-
-
-/**
- * Regular expression for parsing on stack frame in Opera 11.68+
- * @private {!RegExp}
- * @const
- */
-webdriver.stacktrace.OPERA_STACK_FRAME_REGEXP_ = new RegExp('^' +
-    webdriver.stacktrace.OPERA_FUNCTION_CALL_PATTERN_ +
-    webdriver.stacktrace.URL_PATTERN_ + '?$');
-
-
 /**
  * RegExp pattern for function call in a Chakra (IE) stack trace. This
  * expression creates 2 submatches on the (optional) context and function name,
@@ -516,11 +481,6 @@ webdriver.stacktrace.parseStackFrame_ = function(frameStr) {
     return new webdriver.stacktrace.Frame('', m[1], '', m[2]);
   }
 
-  m = frameStr.match(webdriver.stacktrace.OPERA_STACK_FRAME_REGEXP_);
-  if (m) {
-    return new webdriver.stacktrace.Frame(m[2], m[1] || m[3], '', m[4]);
-  }
-
   m = frameStr.match(webdriver.stacktrace.CHAKRA_STACK_FRAME_REGEXP_);
   if (m) {
     return new webdriver.stacktrace.Frame(m[1], m[2], '', m[3]);
@@ -641,12 +601,7 @@ webdriver.stacktrace.parse_ = function(stack) {
     // The first two frames will be:
     //   webdriver.stacktrace.Snapshot()
     //   webdriver.stacktrace.get()
-    // In the case of Opera, sometimes an extra frame is injected in the next
-    // frame with a reported line number of zero. The next line detects that
-    // case and skips that frame.
-    if (!(goog.userAgent.OPERA && i == 2 && frame.getLine() == 0)) {
-      frames.push(frame || webdriver.stacktrace.ANONYMOUS_FRAME_);
-    }
+    frames.push(frame || webdriver.stacktrace.ANONYMOUS_FRAME_);
   }
   return frames;
 };

diff --git a/javascript/webdriver/test/stacktrace_test.js b/javascript/webdriver/test/stacktrace_test.js
@@ -174,53 +174,6 @@ function testParseStackFrameInV8() {
           '/local/dir/path'));
 }
 
-function testParseStackFrameInOpera() {
-  assertStackFrame('empty frame', '@', webdriver.stacktrace.ANONYMOUS_FRAME_);
-
-  assertStackFrame('javascript path only',
-      '@javascript:console.log(Error().stack):1',
-      new webdriver.stacktrace.Frame('', '', '',
-          'javascript:console.log(Error().stack):1'));
-
-  assertStackFrame('path only',
-      '@file:///foo:42',
-      new webdriver.stacktrace.Frame('', '', '', 'file:///foo:42'));
-
-  // (function go() { throw Error() })()
-  // var c = go; c()
-  assertStackFrame('name and empty path',
-      'go([arguments not available])@',
-      new webdriver.stacktrace.Frame('', 'go', '', ''));
-
-  assertStackFrame('name and path',
-      'go([arguments not available])@file:///foo:42',
-      new webdriver.stacktrace.Frame('', 'go', '', 'file:///foo:42'));
-
-  // (function() { throw Error() })()
-  assertStackFrame('anonymous function',
-      '<anonymous function>([arguments not available])@file:///foo:42',
-      new webdriver.stacktrace.Frame('', '', '', 'file:///foo:42'));
-
-  // var b = {foo: function() { throw Error() }}
-  assertStackFrame('object literal function',
-      '<anonymous function: foo>()@file:///foo:42',
-      new webdriver.stacktrace.Frame('', 'foo', '', 'file:///foo:42'));
-
-  // var c = {}; c.foo = function() { throw Error() }
-  assertStackFrame('named object literal function',
-      '<anonymous function: c.foo>()@file:///foo:42',
-      new webdriver.stacktrace.Frame('c', 'foo', '', 'file:///foo:42'));
-
-  assertStackFrame('prototype function',
-      '<anonymous function: Foo.prototype.bar>()@',
-      new webdriver.stacktrace.Frame('Foo.prototype', 'bar', '', ''));
-
-  assertStackFrame('namespaced prototype function',
-      '<anonymous function: goog.Foo.prototype.bar>()@',
-      new webdriver.stacktrace.Frame(
-          'goog.Foo.prototype', 'bar', '', ''));
-}
-
 function testParseClosureCanonicalStackFrame() {
   assertStackFrame('unknown frame', '> (unknown)',
       webdriver.stacktrace.ANONYMOUS_FRAME_);