1.1.1-beta3

unickq · unickq · commit 7e8cd7a6d123 · 2017-11-30T13:17:43.000+02:00
diff --git a/Unickq.SpecFlow.Selenium.Example/App.config b/Unickq.SpecFlow.Selenium.Example/App.config
@@ -46,7 +46,8 @@
         <parameters>
           <parameter name="capabilities">
             <dictionary>
-              <item key="capabilities" value="acceptInsecureCerts=true" />
+              <item key="AcceptUntrustedCertificates" value="true" />
+              <item key="Binary" value="C:\Program Files (x86)\Mozilla Firefox\firefox.exe" />
             </dictionary>
           </parameter>
         </parameters>
diff --git a/Unickq.SpecFlow.Selenium.Plugin/Local/ChromeDriver.cs b/Unickq.SpecFlow.Selenium.Plugin/Local/ChromeDriver.cs
@@ -19,6 +19,10 @@ private static ChromeOptions SetOptions(Dictionary<string, object> capabilities)
                 {
                     options.AddArguments(cap.Value.ToString().Split(';'));
                 }
+                else if (cap.Key.Equals("Binary", StringComparison.OrdinalIgnoreCase))
+                {
+                    options.BinaryLocation = cap.Value.ToString();
+                }
                 else if (cap.Key.Equals("Extensions", StringComparison.OrdinalIgnoreCase))
                 {
                     options.AddExtensions(cap.Value.ToString().Split(';'));
diff --git a/Unickq.SpecFlow.Selenium.Plugin/Local/FirefoxDriver.cs b/Unickq.SpecFlow.Selenium.Plugin/Local/FirefoxDriver.cs
@@ -9,13 +9,22 @@ public class FirefoxDriver : OpenQA.Selenium.Firefox.FirefoxDriver
         private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities)
         {
             var options = new FirefoxOptions();
+            var profile = new FirefoxProfile();
             foreach (var cap in capabilities)
             {
-                if (cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))
+                if (cap.Key.Equals("FirefoxProfile", StringComparison.OrdinalIgnoreCase))
+                {
+                    profile = new FirefoxProfileManager().GetProfile(cap.Value.ToString());
+                }
+                else if(cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))
                 {
                     var args = Extensions.ParseWithDelimiter(cap.Value.ToString());              
                     options.AddAdditionalCapability(args[0], args[1]);
                 }
+                else if (cap.Key.Equals("Binary", StringComparison.OrdinalIgnoreCase))
+                {
+                    options.BrowserExecutableLocation = cap.Value.ToString();
+                }
                 else if (cap.Key.Equals("Arguments", StringComparison.OrdinalIgnoreCase))
                 {
                     options.AddArguments(cap.Value.ToString().Split(';'));
@@ -29,23 +38,19 @@ private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities
                 {
                     foreach (var extension in cap.Value.ToString().Split(';'))
                     {
-                        options.Profile.AddExtension(extension);
+                        profile.AddExtension(extension);
                     }               
                 }
                 else if (cap.Key.Equals("AcceptUntrustedCertificates", StringComparison.OrdinalIgnoreCase))
                 {
-                    options.Profile.AcceptUntrustedCertificates = true;
+                    profile.AcceptUntrustedCertificates = true;
                 }
                 else if (cap.Key.Equals("AssumeUntrustedCertificateIssuer", StringComparison.OrdinalIgnoreCase))
                 {
                     options.Profile.AssumeUntrustedCertificateIssuer = true;
-                }
-                else if (cap.Key.Equals("FirefoxProfile", StringComparison.OrdinalIgnoreCase))
-                {
-                    var profile = new FirefoxProfileManager().GetProfile(cap.Value.ToString());
-                    options.Profile = profile;
-                }
+                }               
             }
+            options.Profile = profile;
             return options;
         }
 
diff --git a/Unickq.SpecFlow.Selenium.Plugin/Unickq.SpecFlow.Selenium.SpecFlowPlugin.csproj b/Unickq.SpecFlow.Selenium.Plugin/Unickq.SpecFlow.Selenium.SpecFlowPlugin.csproj
@@ -3,16 +3,18 @@
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
     <PackageId>Unickq.SpecFlow.Selenium</PackageId>
-    <Version>1.1.1-beta2</Version>
+    <Version>1.1.1-beta3</Version>
     <Authors>Nick Chursin</Authors>
     <Description>Test class generator to drive automated web ui tests with Selenium and SpecFlow 2.2.0. Works with BrowserStack, SauceLabs, TestingBot, CrossbrowserTesting and any WebDriver grid.  Based on Baseclass.Contrib.SpecFlow.Selenium.NUnit.</Description>
     <PackageProjectUrl></PackageProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/allure-framework/allure-csharp/master/img/allure-specflow.png</PackageIconUrl>
+    <PackageIconUrl></PackageIconUrl>
     <RepositoryUrl>https://github.com/unickq/allure-csharp-fork</RepositoryUrl>
     <PackageTags>specflow selenium nunit</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <AssemblyName>Unickq.SpecFlow.Selenium.SpecFlowPlugin</AssemblyName>
     <RootNamespace>Unickq.SpecFlow.Selenium</RootNamespace>
+    <AssemblyVersion>1.1.1.3</AssemblyVersion>
+    <FileVersion>1.1.1.3</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
diff --git a/nuget.nuspec b/nuget.nuspec
@@ -27,6 +27,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="Unickq.SpecFlow.Selenium.Plugin\bin\Release\Unickq.SpecFlow.Selenium.SpecFlowPlugin.dll" target="lib\" />
+    <file src="Unickq.SpecFlow.Selenium.Plugin\bin\Release\net45\Unickq.SpecFlow.Selenium.SpecFlowPlugin.dll" target="lib\net45" />
   </files>
 </package>

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ private static ChromeOptions SetOptions(Dictionary<string, object> capabilities)`
`19`	`19`	`{`
`20`	`20`	`options.AddArguments(cap.Value.ToString().Split(';'));`
`21`	`21`	`}`
	`22`	`+ else if (cap.Key.Equals("Binary", StringComparison.OrdinalIgnoreCase))`
	`23`	`+ {`
	`24`	`+ options.BinaryLocation = cap.Value.ToString();`
	`25`	`+ }`
`22`	`26`	`else if (cap.Key.Equals("Extensions", StringComparison.OrdinalIgnoreCase))`
`23`	`27`	`{`
`24`	`28`	`options.AddExtensions(cap.Value.ToString().Split(';'));`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,22 @@ public class FirefoxDriver : OpenQA.Selenium.Firefox.FirefoxDriver`
`9`	`9`	`private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities)`
`10`	`10`	`{`
`11`	`11`	`var options = new FirefoxOptions();`
	`12`	`+ var profile = new FirefoxProfile();`
`12`	`13`	`foreach (var cap in capabilities)`
`13`	`14`	`{`
`14`		`- if (cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))`
	`15`	`+ if (cap.Key.Equals("FirefoxProfile", StringComparison.OrdinalIgnoreCase))`
	`16`	`+ {`
	`17`	`+ profile = new FirefoxProfileManager().GetProfile(cap.Value.ToString());`
	`18`	`+ }`
	`19`	`+ else if(cap.Key.StartsWith("Capability", StringComparison.OrdinalIgnoreCase))`
`15`	`20`	`{`
`16`	`21`	`var args = Extensions.ParseWithDelimiter(cap.Value.ToString());`
`17`	`22`	`options.AddAdditionalCapability(args[0], args[1]);`
`18`	`23`	`}`
	`24`	`+ else if (cap.Key.Equals("Binary", StringComparison.OrdinalIgnoreCase))`
	`25`	`+ {`
	`26`	`+ options.BrowserExecutableLocation = cap.Value.ToString();`
	`27`	`+ }`
`19`	`28`	`else if (cap.Key.Equals("Arguments", StringComparison.OrdinalIgnoreCase))`
`20`	`29`	`{`
`21`	`30`	`options.AddArguments(cap.Value.ToString().Split(';'));`
`@@ -29,23 +38,19 @@ private static FirefoxOptions SetOptions(Dictionary<string, object> capabilities`
`29`	`38`	`{`
`30`	`39`	`foreach (var extension in cap.Value.ToString().Split(';'))`
`31`	`40`	`{`
`32`		`- options.Profile.AddExtension(extension);`
	`41`	`+ profile.AddExtension(extension);`
`33`	`42`	`}`
`34`	`43`	`}`
`35`	`44`	`else if (cap.Key.Equals("AcceptUntrustedCertificates", StringComparison.OrdinalIgnoreCase))`
`36`	`45`	`{`
`37`		`- options.Profile.AcceptUntrustedCertificates = true;`
	`46`	`+ profile.AcceptUntrustedCertificates = true;`
`38`	`47`	`}`
`39`	`48`	`else if (cap.Key.Equals("AssumeUntrustedCertificateIssuer", StringComparison.OrdinalIgnoreCase))`
`40`	`49`	`{`
`41`	`50`	`options.Profile.AssumeUntrustedCertificateIssuer = true;`
`42`		`- }`
`43`		`- else if (cap.Key.Equals("FirefoxProfile", StringComparison.OrdinalIgnoreCase))`
`44`		`- {`
`45`		`- var profile = new FirefoxProfileManager().GetProfile(cap.Value.ToString());`
`46`		`- options.Profile = profile;`
`47`		`- }`
	`51`	`+ }`
`48`	`52`	`}`
	`53`	`+ options.Profile = profile;`
`49`	`54`	`return options;`
`50`	`55`	`}`
`51`	`56`