[js] rewrite webdriver.logging as a pure node module

SeleniumHQ · Jan 25, 2016 · 2e0a0bd · 2e0a0bd
1 parent 3c1f820
commit 2e0a0bd
Show file tree

Hide file tree

Showing 11 changed files with 963 additions and 23 deletions.
diff --git a/javascript/node/selenium-webdriver/builder.js b/javascript/node/selenium-webdriver/builder.js
@@ -246,7 +246,7 @@ Builder.prototype.setProxy = function(config) {
 /**
  * Sets the logging preferences for the created session. Preferences may be
  * changed by repeated calls, or by calling {@link #withCapabilities}.
- * @param {!(webdriver.logging.Preferences|Object.<string, string>)} prefs The
+ * @param {!(./lib/logging.Preferences|Object<string, string>)} prefs The
  *     desired logging preferences.
  * @return {!Builder} A self reference.
  */

diff --git a/javascript/node/selenium-webdriver/chrome.js b/javascript/node/selenium-webdriver/chrome.js
@@ -387,7 +387,7 @@ var Options = function() {
   /** @private {!Array.<(string|!Buffer)>} */
   this.extensions_ = [];
 
-  /** @private {?webdriver.logging.Preferences} */
+  /** @private {?./lib/logging.Preferences} */
   this.logPrefs_ = null;
 
   /** @private {?webdriver.ProxyConfig} */
@@ -530,7 +530,7 @@ Options.prototype.setUserPreferences = function(prefs) {
 
 /**
  * Sets the logging preferences for the new session.
- * @param {!webdriver.logging.Preferences} prefs The logging preferences.
+ * @param {!./lib/logging.Preferences} prefs The logging preferences.
  * @return {!Options} A self reference.
  */
 Options.prototype.setLoggingPrefs = function(prefs) {

diff --git a/javascript/node/selenium-webdriver/firefox/index.js b/javascript/node/selenium-webdriver/firefox/index.js
@@ -119,7 +119,7 @@ var Options = function() {
   /** @private {Binary} */
   this.binary_ = null;
 
-  /** @private {webdriver.logging.Preferences} */
+  /** @private {./lib/logging.Preferences} */
   this.logPrefs_ = null;
 
   /** @private {webdriver.ProxyConfig} */
@@ -162,7 +162,7 @@ Options.prototype.setBinary = function(binary) {
 
 /**
  * Sets the logging preferences for the new session.
- * @param {webdriver.logging.Preferences} prefs The logging preferences.
+ * @param {./lib/logging.Preferences} prefs The logging preferences.
  * @return {!Options} A self reference.
  */
 Options.prototype.setLoggingPreferences = function(prefs) {

diff --git a/javascript/node/selenium-webdriver/http/index.js b/javascript/node/selenium-webdriver/http/index.js
@@ -28,7 +28,7 @@ const url = require('url');
 const error = require('../error');
 const base = require('../lib/_base');
 const cmd = require('../lib/command');
-const logging = base.require('webdriver.logging');
+const logging = require('../lib/logging');
 
 
 

diff --git a/javascript/node/selenium-webdriver/index.js b/javascript/node/selenium-webdriver/index.js
@@ -24,6 +24,7 @@ var builder = require('./builder');
 var error = require('./error');
 var base = require('./lib/_base');
 var command = require('./lib/command');
+var logging = require('./lib/logging');
 
 
 // NOTE: the remainder of this file is nasty and verbose, but the annotations
@@ -114,10 +115,7 @@ exports.WebElementPromise = base.require('webdriver.WebElementPromise');
 }));
 
 
-/** @type {webdriver.logging.} */
-(exports.__defineGetter__('logging', function() {
-  return base.exportPublicApi('webdriver.logging');
-}));
+exports.logging = logging;
 
 
 /** @type {webdriver.promise.} */

diff --git a/javascript/node/selenium-webdriver/lib/_base.js b/javascript/node/selenium-webdriver/lib/_base.js
@@ -112,8 +112,9 @@ function Context(opt_configureForTesting) {
     goog: {},
     webdriver: {
       get Command() { return require('./command').Command; },
-      get CommandName() { return require('./command').Name; }
-      // get CommandExecutor() { return require('./command').Executor; }
+      get CommandName() { return require('./command').Name; },
+      get CommandExecutor() { return require('./command').Executor; },
+      get logging() { return require('./logging'); }
     }
   });
   closure.window = closure.top = closure;
@@ -132,7 +133,8 @@ function Context(opt_configureForTesting) {
 
   let provide = closure.goog.provide;
   closure.goog.provide = function(symbol) {
-    if (symbol.startsWith('webdriver.Command')) {
+    if (symbol.startsWith('webdriver.Command')
+        || symbol.startsWith('webdriver.logging')) {
       return;
     }
     provide(symbol);