Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-12 17:22:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1245064 - Lint GeckoDriver#setSessionCapabilities; r=automatedtester

Browse Source 
MozReview-Commit-ID: GXLGqjKCfVA

--HG--
extra : rebase_source : 8a58e5df7e1bf097b26597d6632bab6742a26bc2
This commit is contained in:
Andreas Tolfsen 2016-03-04 18:03:28 +00:00
parent 158557f87b
commit 176f8137f9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/marionette/driver.js
View File

@ -622,6 +622,7 @@ GeckoDriver.prototype.setSessionCapabilities = function(newCaps) {
case "desiredCapabilities": case "desiredCapabilities":
to = copy(from[key], to); to = copy(from[key], to);
break; break;
case "requiredCapabilities": case "requiredCapabilities":
if (from[key].proxy) { if (from[key].proxy) {
this.setUpProxy(from[key].proxy); this.setUpProxy(from[key].proxy);
@ -631,16 +632,17 @@ GeckoDriver.prototype.setSessionCapabilities = function(newCaps) {
for (let caps in from[key]) { for (let caps in from[key]) {
if (from[key][caps] !== this.sessionCapabilities[caps]) { if (from[key][caps] !== this.sessionCapabilities[caps]) {
errors.push(from[key][caps] + " does not equal " + errors.push(from[key][caps] + " does not equal " +
this.sessionCapabilities[caps]) ; this.sessionCapabilities[caps]);
} }
} }
break; break;
default: default:
to[key] = from[key]; to[key] = from[key];
} }
} }
if (Object.keys(errors).length === 0) { if (Object.keys(errors).length == 0) {
return to; return to;
} }