Skip to content

Commit 2e0a0bd

Browse files
committed
[js] rewrite webdriver.logging as a pure node module
1 parent 3c1f820 commit 2e0a0bd

File tree

11 files changed

+963
-23
lines changed

11 files changed

+963
-23
lines changed

javascript/node/selenium-webdriver/builder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ Builder.prototype.setProxy = function(config) {
246246
/**
247247
* Sets the logging preferences for the created session. Preferences may be
248248
* changed by repeated calls, or by calling {@link #withCapabilities}.
249-
* @param {!(webdriver.logging.Preferences|Object.<string, string>)} prefs The
249+
* @param {!(./lib/logging.Preferences|Object<string, string>)} prefs The
250250
* desired logging preferences.
251251
* @return {!Builder} A self reference.
252252
*/

javascript/node/selenium-webdriver/chrome.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ var Options = function() {
387387
/** @private {!Array.<(string|!Buffer)>} */
388388
this.extensions_ = [];
389389

390-
/** @private {?webdriver.logging.Preferences} */
390+
/** @private {?./lib/logging.Preferences} */
391391
this.logPrefs_ = null;
392392

393393
/** @private {?webdriver.ProxyConfig} */
@@ -530,7 +530,7 @@ Options.prototype.setUserPreferences = function(prefs) {
530530

531531
/**
532532
* Sets the logging preferences for the new session.
533-
* @param {!webdriver.logging.Preferences} prefs The logging preferences.
533+
* @param {!./lib/logging.Preferences} prefs The logging preferences.
534534
* @return {!Options} A self reference.
535535
*/
536536
Options.prototype.setLoggingPrefs = function(prefs) {

javascript/node/selenium-webdriver/firefox/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ var Options = function() {
119119
/** @private {Binary} */
120120
this.binary_ = null;
121121

122-
/** @private {webdriver.logging.Preferences} */
122+
/** @private {./lib/logging.Preferences} */
123123
this.logPrefs_ = null;
124124

125125
/** @private {webdriver.ProxyConfig} */
@@ -162,7 +162,7 @@ Options.prototype.setBinary = function(binary) {
162162

163163
/**
164164
* Sets the logging preferences for the new session.
165-
* @param {webdriver.logging.Preferences} prefs The logging preferences.
165+
* @param {./lib/logging.Preferences} prefs The logging preferences.
166166
* @return {!Options} A self reference.
167167
*/
168168
Options.prototype.setLoggingPreferences = function(prefs) {

javascript/node/selenium-webdriver/http/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const url = require('url');
2828
const error = require('../error');
2929
const base = require('../lib/_base');
3030
const cmd = require('../lib/command');
31-
const logging = base.require('webdriver.logging');
31+
const logging = require('../lib/logging');
3232

3333

3434

javascript/node/selenium-webdriver/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var builder = require('./builder');
2424
var error = require('./error');
2525
var base = require('./lib/_base');
2626
var command = require('./lib/command');
27+
var logging = require('./lib/logging');
2728

2829

2930
// NOTE: the remainder of this file is nasty and verbose, but the annotations
@@ -114,10 +115,7 @@ exports.WebElementPromise = base.require('webdriver.WebElementPromise');
114115
}));
115116

116117

117-
/** @type {webdriver.logging.} */
118-
(exports.__defineGetter__('logging', function() {
119-
return base.exportPublicApi('webdriver.logging');
120-
}));
118+
exports.logging = logging;
121119

122120

123121
/** @type {webdriver.promise.} */

javascript/node/selenium-webdriver/lib/_base.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ function Context(opt_configureForTesting) {
112112
goog: {},
113113
webdriver: {
114114
get Command() { return require('./command').Command; },
115-
get CommandName() { return require('./command').Name; }
116-
// get CommandExecutor() { return require('./command').Executor; }
115+
get CommandName() { return require('./command').Name; },
116+
get CommandExecutor() { return require('./command').Executor; },
117+
get logging() { return require('./logging'); }
117118
}
118119
});
119120
closure.window = closure.top = closure;
@@ -132,7 +133,8 @@ function Context(opt_configureForTesting) {
132133

133134
let provide = closure.goog.provide;
134135
closure.goog.provide = function(symbol) {
135-
if (symbol.startsWith('webdriver.Command')) {
136+
if (symbol.startsWith('webdriver.Command')
137+
|| symbol.startsWith('webdriver.logging')) {
136138
return;
137139
}
138140
provide(symbol);

0 commit comments

Comments
 (0)