selenium-webdriver - npm Package Compare versions

Comparing version 2.35.2 to 2.37.0

CHANGES.md

@@ -0,1 +1,10 @@
+## v2.37.0
+
+* FIXED: 6346: The remote.SeleniumServer class now accepts JVM arguments using
+    the `jvmArgs` option.
+
+## v2.36.0
+
+* _Release skipped to stay in sync with main Selenium project._
+
 ## v2.35.2
@@ -2,0 +11,0 @@

lib/atoms/userAgent.js

@@ -247,1 +247,9 @@ // Copyright 2011 WebDriver committers
     bot.userAgent.isProductVersion(6);
+
+/**
+ * Whether the current browser is Windows Phone.
+ * @type {boolean}
+ * @const
+ */
+bot.userAgent.WINDOWS_PHONE = goog.userAgent.IE &&
+    goog.userAgent.getUserAgentString().indexOf('IEMobile') != -1;

lib/webdriver/capabilities.js

@@ -34,7 +34,8 @@ // Copyright 2013 Software Freedom Conservancy
   INTERNET_EXPLORER: 'internet explorer',
-  IPAD: 'ipad',
-  IPHONE: 'iphone',
+  IPAD: 'iPad',
+  IPHONE: 'iPhone',
   OPERA: 'opera',
   PHANTOM_JS: 'phantomjs',
-  SAFARI: 'safari'
+  SAFARI: 'safari',
+  HTMLUNIT: 'htmlunit'
 };
@@ -236,3 +237,20 @@
 
+/**
+ * @return {!webdriver.Capabilities} A basic set of capabilities for HTMLUnit.
+ */
+webdriver.Capabilities.htmlunit = function() {
+  return new webdriver.Capabilities().
+      set(webdriver.Capability.BROWSER_NAME, webdriver.Browser.HTMLUNIT);
+};
 
+/**
+ * @return {!webdriver.Capabilities} A basic set of capabilities for HTMLUnit
+ *                                   with enabled Javascript.
+ */
+webdriver.Capabilities.htmlunitwithjs = function() {
+  return new webdriver.Capabilities().
+      set(webdriver.Capability.BROWSER_NAME, webdriver.Browser.HTMLUNIT).
+      set(webdriver.Capability.SUPPORTS_JAVASCRIPT, true);
+};
+
 /** @return {!Object} The JSON representation of this instance. */
@@ -239,0 +257,0 @@ webdriver.Capabilities.prototype.toJSON = function() {

package.json

 {
     "name": "selenium-webdriver",
-    "version": "2.35.2",
+    "version": "2.37.0",
     "description": "The official WebDriver JavaScript bindings from the Selenium project",
@@ -5,0 +5,0 @@ "keywords": [

remote/index.js

@@ -259,3 +259,4 @@ // Copyright 2013 Software Freedom Conservancy
  * @param {string} jar Path to the Selenium server jar.
- * @param {!ServiceOptions} options Configuration options for the server.
+ * @param {!SeleniumServer.Options} options Configuration options for the
+ *     server.
  * @throws {Error} If an invalid port is specified.
@@ -270,5 +271,7 @@ * @constructor
   var port = options.port || portprober.findFreePort();
-  var args = promise.when(options.args || [], function(args) {
-    return promise.when(port, function(port) {
-      return ['-jar', jar, '-port', port].concat(args);
+  var args = promise.when(options.jvmArgs || [], function(jvmArgs) {
+    return promise.when(options.args || [], function(args) {
+      return promise.when(port, function(port) {
+        return jvmArgs.concat(['-jar', jar, '-port', port]).concat(args);
+      });
     });
@@ -288,2 +291,37 @@ });
 
+/**
+ * Options for the Selenium server:
+ * <dl>
+ * <dt>port
+ * <dd>The port to start the server on (must be > 0). If the port is
+ *     provided as a promise, the service will wait for the promise to
+ *     resolve before starting.
+ * <dt>args
+ * <dd>The arguments to pass to the service. If a promise is provided,
+ *     the service will wait for it to resolve before starting.
+ * <dt>jvmArgs
+ * <dd>The arguments to pass to the JVM. If a promise is provided, the service
+ *     will wait for it to resolve before starting.
+ * <dt>env
+ * <dd>The environment variables that should be visible to the server
+ *     process. Defaults to inheriting the current process's environment.
+ * <dt>stdio
+ * <dd>IO configuration for the spawned server process. For more
+ *     information, refer to the documentation of
+ *     {@code child_process.spawn}.
+ * </dl>
+ *
+ * @typedef {{
+ *   port: (number|!webdriver.promise.Promise.<number>),
+ *   args: !(Array.<string>|webdriver.promise.Promise.<!Array.<string>>),
+ *   jvmArgs: (!Array.<string>|
+ *             !webdriver.promise.Promise.<!Array.<string>>|
+ *             undefined)
+ *   env: (!Object.<string, string>|undefined),
+ *   stdio: (string|!Array.<string|number|!Stream|null|undefined>|undefined)
+ * }}
+ */
+SeleniumServer.Options;
+
+
 // PUBLIC API
@@ -290,0 +328,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1780298

increased by0.14%

Lines of code

28354

increased by0.21%

No dependency changes