marionette-client
Advanced tools
Comparing version 1.1.1 to 1.1.2
@@ -921,2 +921,3 @@ (function(module, ns) { | ||
setState(this, 'scriptTimeout', timeout); | ||
this.driver.setScriptTimeout(timeout); | ||
return this._sendCommand(cmd, 'ok', callback); | ||
@@ -923,0 +924,0 @@ }, |
@@ -55,2 +55,12 @@ (function(module, ns) { | ||
/** | ||
* We just set the script timeout. | ||
* If you need to do something in the driver. | ||
* | ||
* @method setScriptTiemout | ||
* @param {Integer} the timeout value. | ||
*/ | ||
setScriptTimeout: function setScriptTimeout(timeout) { | ||
}, | ||
/** | ||
* Sends remote command to server. | ||
@@ -57,0 +67,0 @@ * Each command will be queued while waiting for |
@@ -6,2 +6,3 @@ var wire = require('json-wire-protocol'); | ||
var DEFAULT_PORT = 2828; | ||
var SOCKET_TIMEOUT_EXTRA = 500; | ||
@@ -24,2 +25,3 @@ function TcpSync(options) { | ||
this.sockit = new sockittome.Sockit(); | ||
this.sockit.setPollTimeout(this.connectionTimeout + SOCKET_TIMEOUT_EXTRA); | ||
}; | ||
@@ -33,2 +35,6 @@ | ||
TcpSync.prototype.setScriptTimeout = function(timeout) { | ||
this.sockit.setPollTimeout(timeout + SOCKET_TIMEOUT_EXTRA); | ||
}; | ||
TcpSync.prototype.connect = function(callback) { | ||
@@ -35,0 +41,0 @@ |
@@ -82,3 +82,3 @@ /** | ||
* @param {Function} callback element callback. | ||
* @return {Object} self. | ||
* @return {Array} elements matched the query string. | ||
*/ | ||
@@ -96,10 +96,14 @@ findElements: function findElement(query, method, callback) { | ||
* a function with this element as first argument. | ||
* | ||
* | ||
* @method scriptWith | ||
* @param {Function|String} script remote script. | ||
* @param {Array} [args] optional arguments for script. | ||
* @param {Function} callback callback when script completes. | ||
* @return {String|Number} return value of the script. | ||
*/ | ||
scriptWith: function scriptWith(script, callback) { | ||
return this.client.executeScript(script, [this], callback); | ||
scriptWith: function scriptWith(script, args, callback) { | ||
if (!Array.isArray(args)) { | ||
callback = args; | ||
args = []; | ||
} | ||
return this.client.executeScript(script, [this].concat(args), callback); | ||
}, | ||
@@ -128,3 +132,3 @@ | ||
* @param {Function} callback gets called with attribute's value. | ||
* @return {Object} self. | ||
* @return {String} the value of the Attribute. | ||
*/ | ||
@@ -183,3 +187,3 @@ getAttribute: function getAttribute(attr, callback) { | ||
* @param {Function} callback text of element. | ||
* @return {Object} self. | ||
* @return {String} text of element. | ||
*/ | ||
@@ -198,2 +202,3 @@ text: function text(callback) { | ||
* @param {Function} callback node style [err, tagName]. | ||
* @return {String} tag name of element. | ||
*/ | ||
@@ -215,2 +220,3 @@ tagName: function tagName(callback) { | ||
* @param {Function} [callback] [Error err] | ||
* @return {object} self | ||
*/ | ||
@@ -217,0 +223,0 @@ tap: function(x, y, callback) { |
{ | ||
"name": "marionette-client", | ||
"version": "1.1.1", | ||
"version": "1.1.2", | ||
"main": "lib/marionette/index", | ||
@@ -11,3 +11,3 @@ "description": "Marionette Javascript Client", | ||
"socket-retry-connect": "~0.0.1", | ||
"sockit-to-me": "~0.1" | ||
"sockit-to-me": "~0.2" | ||
}, | ||
@@ -14,0 +14,0 @@ "scripts": { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
93796
3056
+ Addedsockit-to-me@0.2.5(transitive)
- Removedsockit-to-me@0.1.8(transitive)
Updatedsockit-to-me@~0.2