Only set "marionette" capability for false case

jimevans · jimevans · commit 68dd9a6fdb76 · 2017-04-14T09:22:12.000-07:00
Starting with Geckodriver 0.16, the marionette capability is not
recognized as valid, and will not create a session if it's specified.
diff --git a/dotnet/src/webdriver/Firefox/FirefoxOptions.cs b/dotnet/src/webdriver/Firefox/FirefoxOptions.cs
@@ -305,15 +305,14 @@ public void AddAdditionalCapability(string capabilityName, object capabilityValu
         public override ICapabilities ToCapabilities()
         {
             DesiredCapabilities capabilities = DesiredCapabilities.Firefox();
-            capabilities.SetCapability(IsMarionetteCapability, this.isMarionette);
-
             if (this.isMarionette)
             {
                 Dictionary<string, object> firefoxOptions = this.GenerateFirefoxOptionsDictionary();
                 capabilities.SetCapability(FirefoxOptionsCapability, firefoxOptions);
             }
             else
             {
+                capabilities.SetCapability(IsMarionetteCapability, this.isMarionette);
                 if (this.profile != null)
                 {
                     capabilities.SetCapability(FirefoxProfileCapability, this.profile.ToBase64String());

Original file line number	Diff line number	Diff line change
`@@ -305,15 +305,14 @@ public void AddAdditionalCapability(string capabilityName, object capabilityValu`
`305`	`305`	`public override ICapabilities ToCapabilities()`
`306`	`306`	`{`
`307`	`307`	`DesiredCapabilities capabilities = DesiredCapabilities.Firefox();`
`308`		`- capabilities.SetCapability(IsMarionetteCapability, this.isMarionette);`
`309`		`-`
`310`	`308`	`if (this.isMarionette)`
`311`	`309`	`{`
`312`	`310`	`Dictionary<string, object> firefoxOptions = this.GenerateFirefoxOptionsDictionary();`
`313`	`311`	`capabilities.SetCapability(FirefoxOptionsCapability, firefoxOptions);`
`314`	`312`	`}`
`315`	`313`	`else`
`316`	`314`	`{`
	`315`	`+ capabilities.SetCapability(IsMarionetteCapability, this.isMarionette);`
`317`	`316`	`if (this.profile != null)`
`318`	`317`	`{`
`319`	`318`	`capabilities.SetCapability(FirefoxProfileCapability, this.profile.ToBase64String());`