Comparing version 0.2.16 to 0.2.17
@@ -0,1 +1,2 @@ | ||
/* jshint evil:true */ | ||
var args = Array.prototype.slice.call(arguments, 0); | ||
@@ -2,0 +3,0 @@ var code = args[0], fargs = args[1], done = args[2]; |
@@ -0,1 +1,2 @@ | ||
/* jshint evil:true */ | ||
var args = Array.prototype.slice.call(arguments, 0); | ||
@@ -2,0 +3,0 @@ var code = args[0], fargs = args[1]; |
@@ -0,1 +1,2 @@ | ||
/* jshint evil:true */ | ||
var args = Array.prototype.slice.call(arguments, 0); | ||
@@ -5,4 +6,5 @@ var condExpr = args[0], timeout = args[1], | ||
var waitForConditionImpl = function(conditionExpr, limit, poll, cb) { | ||
var res; | ||
if ((new Date().getTime()) < limit) { | ||
var res = eval(conditionExpr); | ||
res = eval(conditionExpr); | ||
if (res === true ) { | ||
@@ -9,0 +11,0 @@ cb(res); |
var _ = require('lodash'), | ||
__slice = Array.prototype.slice, | ||
_ = require('lodash'), | ||
async = require('async'), | ||
utils = require("./utils"); | ||
// TouchAction object | ||
@@ -34,3 +33,3 @@ // Wrapper around touch gestures | ||
TouchAction.prototype.applyToElement = function(element) { | ||
var clone = new TouchAction(); | ||
var clone = new TouchAction(); | ||
clone.element = element; | ||
@@ -69,9 +68,9 @@ clone.gestures = _.cloneDeep(this.gestures); | ||
var Element = require('./element'); | ||
var browser, element; | ||
var browser, element; | ||
if(browserOrElement instanceof Element) { | ||
element = browserOrElement; | ||
browser = element.browser; | ||
browser = element.browser; | ||
} else { | ||
browser = browserOrElement; | ||
} | ||
} | ||
if(browser.isPromised) { | ||
@@ -106,3 +105,3 @@ return browser.performTouch(element, this); | ||
var ensureElement = false; | ||
if (_(opts.x).isUndefined() || _(opts.y).isUndefined) { | ||
if (_(opts.x).isUndefined() || _(opts.y).isUndefined()) { | ||
ensureElement = true; | ||
@@ -164,3 +163,3 @@ opts.x = null; | ||
MultiAction.prototype.add = function () { | ||
MultiAction.prototype.add = function () { | ||
var actions = __slice.call(arguments, 0); | ||
@@ -178,9 +177,9 @@ _(actions).each(function(action) { | ||
var Element = require('./element'); | ||
var browser, element; | ||
var browser, element; | ||
if(browserOrElement instanceof Element) { | ||
element = browserOrElement; | ||
browser = element.browser; | ||
browser = element.browser; | ||
} else { | ||
browser = browserOrElement; | ||
} | ||
} | ||
if(browser.isPromised) { | ||
@@ -187,0 +186,0 @@ return browser.performMultiTouch(element, this); |
@@ -146,3 +146,3 @@ var utils = require("./utils"), | ||
var el; | ||
if (obj.value.ELEMENT){ | ||
if (obj.value.ELEMENT){ | ||
el = browser.newElement(obj.value.ELEMENT); | ||
@@ -156,3 +156,3 @@ cb(null, el); | ||
} | ||
cb(null, elements); | ||
cb(null, elements); | ||
} else { | ||
@@ -159,0 +159,0 @@ cb(newError( |
@@ -23,5 +23,5 @@ var Args = require("vargs").Constructor, | ||
'-ios uiautomation': 'ByIosUIAutomation', | ||
'-android uiautomator': 'ByAndroidUIAutomator' | ||
'-android uiautomator': 'ByAndroidUIAutomator' | ||
}; | ||
exports.elFuncSuffix = function(type){ | ||
exports.elFuncSuffix = function(type){ | ||
var suffix = STRAT_MAPPING[type]; | ||
@@ -31,3 +31,3 @@ if(!suffix) { | ||
function($1){return $1.toUpperCase().replace(' ','');}) | ||
.replace('Xpath', 'XPath'); | ||
.replace('Xpath', 'XPath'); | ||
} | ||
@@ -34,0 +34,0 @@ return suffix; |
@@ -10,3 +10,3 @@ { | ||
], | ||
"version": "0.2.16", | ||
"version": "0.2.17", | ||
"author": "Adam Christian <adam.christian@gmail.com>", | ||
@@ -73,3 +73,4 @@ "contributors": [ | ||
"istanbul": "~0.2.4", | ||
"promise-simple": "~0.1.0" | ||
"promise-simple": "~0.1.0", | ||
"jshint": "^2.5.0" | ||
}, | ||
@@ -76,0 +77,0 @@ "scripts": { |
@@ -0,1 +1,2 @@ | ||
/*global _:true, Q:true */ | ||
var Mocha = require('mocha'), | ||
@@ -2,0 +3,0 @@ fs = require('fs'), |
GLOBAL._ = require('../../lib/lodash'); | ||
/*global env:true */ | ||
var env = GLOBAL.env = {}; | ||
@@ -4,0 +5,0 @@ |
@@ -38,3 +38,3 @@ var nock = require('nock'); | ||
it("should not have selenium defaults", function(done) { | ||
server = nock('http://localhost:4444') | ||
server = nock('http://localhost:4444'); | ||
server.log(console.log); | ||
@@ -53,5 +53,5 @@ server | ||
browser = wd.remote('http://localhost:4444'); | ||
browser.init({device: 'iPhone'}, function(err) {}); | ||
browser.init({device: 'iPhone'}, function() {}); | ||
}); | ||
}); | ||
}); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
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
670202
12388
15