Add native support for Opera 26+ to webdriverjs

jleyba · jleyba · commit fb2aaf8dd1fe · 2015-02-24T13:09:42.000-08:00
diff --git a/javascript/node/selenium-webdriver/CHANGES.md b/javascript/node/selenium-webdriver/CHANGES.md
@@ -12,6 +12,7 @@ major version release (i.e. 1.0.0).
 
 * Added native support for Internet Explorer - the Java Selenium server is no
     longer required.
+* Added native support for Opera 26+
 * With the release of [Node 0.12.0](http://blog.nodejs.org/2015/02/06/node-v0-12-0-stable/)
     (finally!), the minimum supported version of Node is now `0.10.x`.
 * The `promise` module is now [Promises/A+](https://promisesaplus.com/)
diff --git a/javascript/node/selenium-webdriver/builder.js b/javascript/node/selenium-webdriver/builder.js
@@ -101,6 +101,9 @@ var Builder = function() {
   /** @private {firefox.Options} */
   this.firefoxOptions_ = null;
 
+  /** @private {opera.Options} */
+  this.operaOptions_ = null;
+
   /** @private {boolean} */
   this.ignoreEnv_ = false;
 };
@@ -284,6 +287,21 @@ Builder.prototype.setFirefoxOptions = function(options) {
 };
 
 
+/**
+ * Sets Opera-specific options for drivers created by this builder. Any
+ * logging or proxy settings defined on the given options will take precedence
+ * over those set through {@link #setLoggingPrefs} and {@link #setProxy},
+ * respectively.
+ *
+ * @param {!opera.Options} options The OperaDriver options to use.
+ * @return {!Builder} A self reference.
+ */
+Builder.prototype.setOperaOptions = function(options) {
+  this.operaOptions_ = options;
+  return this;
+};
+
+
 /**
  * Sets the control flow that created drivers should execute actions in. If
  * the flow is never set, or is set to {@code null}, it will use the active
@@ -333,10 +351,13 @@ Builder.prototype.build = function() {
   // Apply browser specific overrides.
   if (browser === Browser.CHROME && this.chromeOptions_) {
     capabilities.merge(this.chromeOptions_.toCapabilities());
-  }
 
-  if (browser === Browser.FIREFOX && this.firefoxOptions_) {
+  } else if (browser === Browser.FIREFOX && this.firefoxOptions_) {
     capabilities.merge(this.firefoxOptions_.toCapabilities());
+
+  } else if (browser === Browser.OPERA && this.operaOptions_) {
+    capabilities.merge(this.operaOptions_.toCapabilities());
+
   }
 
   // Check for a remote browser.
@@ -374,6 +395,12 @@ Builder.prototype.build = function() {
       var ie = require('./ie');
       return new ie.Driver(capabilities, this.flow_);
 
+    case Browser.OPERA:
+      // Requiring 'opera' would create a cycle:
+      // index -> builder -> opera -> index
+      var opera = require('./opera');
+      return new opera.Driver(capabilities, this.flow_);
+
     case Browser.PHANTOM_JS:
       // Requiring 'phantomjs' would create a cycle:
       // index -> builder -> phantomjs -> index
diff --git a/javascript/node/selenium-webdriver/lib/test/index.js b/javascript/node/selenium-webdriver/lib/test/index.js
@@ -34,6 +34,7 @@ var NATIVE_BROWSERS = [
   webdriver.Browser.CHROME,
   webdriver.Browser.FIREFOX,
   webdriver.Browser.IE,
+  webdriver.Browser.OPERA,
   webdriver.Browser.PHANTOM_JS
 ];
 
diff --git a/javascript/node/selenium-webdriver/test/cookie_test.js b/javascript/node/selenium-webdriver/test/cookie_test.js
@@ -63,7 +63,7 @@ test.suite(function(env) {
       assertHasCookies(cookie1, cookie2);
     });
 
-    test.ignore(env.browsers(Browser.IE, Browser.OPERA)).
+    test.ignore(env.browsers(Browser.IE)).
     it('only returns cookies visible to the current page', function() {
       var cookie1 = createCookieSpec();
       var cookie2 = createCookieSpec();
@@ -148,8 +148,7 @@ test.suite(function(env) {
       assertHasCookies();
     });
 
-    test.ignore(env.browsers(
-        Browser.ANDROID, Browser.FIREFOX, Browser.IE, Browser.OPERA)).
+    test.ignore(env.browsers(Browser.ANDROID, Browser.FIREFOX, Browser.IE)).
     it('should retain cookie expiry', function() {
       var cookie = createCookieSpec();
       var expirationDelay = 5 * 1000;
diff --git a/javascript/node/selenium-webdriver/test/element_finding_test.js b/javascript/node/selenium-webdriver/test/element_finding_test.js
@@ -150,8 +150,7 @@ test.suite(function(env) {
                 });
           });
 
-      test.ignore(browsers(Browser.OPERA)).
-      it('works on XHTML pages', function() {
+      test.it('works on XHTML pages', function() {
         driver.get(test.whereIs('actualXhtmlPage.xhtml'));
 
         var el = driver.findElement(By.linkText('Foo'));
diff --git a/javascript/node/selenium-webdriver/test/proxy_test.js b/javascript/node/selenium-webdriver/test/proxy_test.js
@@ -89,7 +89,7 @@ test.suite(function(env) {
   test.afterEach(function() { driver && driver.quit(); });
 
   // Proxy support not implemented.
-  test.ignore(env.browsers(Browser.IE, Browser.SAFARI)).
+  test.ignore(env.browsers(Browser.IE, Browser.OPERA, Browser.SAFARI)).
   describe('manual proxy settings', function() {
     // phantomjs 1.9.1 in webdriver mode does not appear to respect proxy
     // settings.
@@ -133,7 +133,8 @@ test.suite(function(env) {
 
   // PhantomJS does not support PAC file proxy configuration.
   // Safari does not support proxies.
-  test.ignore(env.browsers(Browser.IE, Browser.PHANTOM_JS, Browser.SAFARI)).
+  test.ignore(env.browsers(
+      Browser.IE, Browser.OPERA, Browser.PHANTOM_JS, Browser.SAFARI)).
   describe('pac proxy settings', function() {
     test.it('can configure proxy through PAC file', function() {
       driver = env.builder().
diff --git a/javascript/node/selenium-webdriver/test/upload_test.js b/javascript/node/selenium-webdriver/test/upload_test.js
@@ -50,7 +50,6 @@ test.suite(function(env) {
   test.ignore(env.browsers(
       Browser.IPAD,
       Browser.IPHONE,
-      Browser.OPERA,
       // Uploads broken in PhantomJS 2.0.
       // See https://github.com/ariya/phantomjs/issues/12506
       Browser.PHANTOM_JS,
diff --git a/javascript/node/selenium-webdriver/test/window_test.js b/javascript/node/selenium-webdriver/test/window_test.js
@@ -103,7 +103,8 @@ test.suite(function(env) {
         return position.x === x &&
             // On OSX, the window height may be bumped down 22px for the top
             // status bar.
-           (position.y >= y && position.y <= (y + 22));
+            // On Linux, Opera's window position will be off by 28px.
+           (position.y >= y && position.y <= (y + 28));
       });
     };
   }
