diff --git a/lib/fp/build-modules.js b/lib/fp/build-modules.js index 597273b67..82b379c5e 100644 --- a/lib/fp/build-modules.js +++ b/lib/fp/build-modules.js @@ -83,7 +83,7 @@ function isThru(name) { */ function getTemplate(moduleName) { var data = { - 'name': _.result(mapping.aliasToReal, moduleName, moduleName), + 'name': _.get(mapping.aliasToReal, moduleName, moduleName), 'mapping': mapping }; diff --git a/lib/fp/template/modules/module.jst b/lib/fp/template/modules/module.jst index 289bd2b63..1fb809cb2 100644 --- a/lib/fp/template/modules/module.jst +++ b/lib/fp/template/modules/module.jst @@ -1,5 +1,5 @@ var convert = require('./convert'), - func = convert('<%= name %>', require('../<%= _.result(mapping.remap, name, name) %>')); + func = convert('<%= name %>', require('../<%= _.get(mapping.remap, name, name) %>')); func.placeholder = require('./placeholder'); module.exports = func; diff --git a/lib/fp/template/modules/thru.jst b/lib/fp/template/modules/thru.jst index 5bc1a7b03..838e8b03a 100644 --- a/lib/fp/template/modules/thru.jst +++ b/lib/fp/template/modules/thru.jst @@ -1,5 +1,5 @@ var convert = require('./convert'), - func = convert('<%= name %>', require('../<%= _.result(mapping.remap, name, name) %>'), require('./_falseOptions')); + func = convert('<%= name %>', require('../<%= _.get(mapping.remap, name, name) %>'), require('./_falseOptions')); func.placeholder = require('./placeholder'); module.exports = func; diff --git a/test/saucelabs.js b/test/saucelabs.js index f8a7554ff..48318406f 100644 --- a/test/saucelabs.js +++ b/test/saucelabs.js @@ -294,7 +294,7 @@ function optionToArray(name, string) { function optionToValue(name, string) { var result = string.match(RegExp('^' + name + '(?:=([\\s\\S]+))?$')); if (result) { - result = _.result(result, 1); + result = _.get(result, 1); result = result ? _.trim(result) : true; } if (result === 'false') { @@ -366,8 +366,8 @@ function onJobStart(error, res, body) { if (this.stopping) { return; } - var statusCode = _.result(res, 'statusCode'), - taskId = _.first(_.result(body, 'js tests')); + var statusCode = _.get(res, 'statusCode'), + taskId = _.first(_.get(body, 'js tests')); if (error || !taskId || statusCode != 200) { if (this.attempts < this.retries) { @@ -408,19 +408,19 @@ function onJobStatus(error, res, body) { if (!this.running || this.stopping) { return; } - var completed = _.result(body, 'completed', false), - data = _.first(_.result(body, 'js tests')), + var completed = _.get(body, 'completed', false), + data = _.first(_.get(body, 'js tests')), elapsed = (_.now() - this.timestamp) / 1000, - jobId = _.result(data, 'job_id', null), - jobResult = _.result(data, 'result', null), - jobStatus = _.result(data, 'status', ''), - jobUrl = _.result(data, 'url', null), + jobId = _.get(data, 'job_id', null), + jobResult = _.get(data, 'result', null), + jobStatus = _.get(data, 'status', ''), + jobUrl = _.get(data, 'url', null), expired = (elapsed >= queueTimeout && !_.includes(jobStatus, 'in progress')), options = this.options, platform = options.platforms[0]; if (_.isObject(jobResult)) { - var message = _.result(jobResult, 'message'); + var message = _.get(jobResult, 'message'); } else { if (typeof jobResult == 'string') { message = jobResult; @@ -442,7 +442,7 @@ function onJobStatus(error, res, body) { } var description = browserName(platform[1]) + ' ' + platform[2] + ' on ' + _.startCase(platform[0]), errored = !jobResult || !jobResult.passed || reError.test(message) || reError.test(jobStatus), - failures = _.result(jobResult, 'failed'), + failures = _.get(jobResult, 'failed'), label = options.name + ':', tunnel = this.tunnel; diff --git a/test/test-fp.js b/test/test-fp.js index cade9cc09..710f02950 100644 --- a/test/test-fp.js +++ b/test/test-fp.js @@ -345,7 +345,7 @@ var aryCap = index + 1; var methodNames = _.filter(mapping.aryMethod[aryCap], function(methodName) { - var key = _.result(mapping.remap, methodName, methodName), + var key = _.get(mapping.remap, methodName, methodName), arity = _[key].length; return arity != 0 && arity < aryCap;