Updating .NET tests to allow navigating to https test pages

sboles · Jul 6, 2015 · f7b46bb · f7b46bb
1 parent dc0cd1e
commit f7b46bb
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 4 deletions.
diff --git a/dotnet/test/chrome/WebDriver.Chrome.Tests.config b/dotnet/test/chrome/WebDriver.Chrome.Tests.config
@@ -9,6 +9,7 @@
     <add key="Protocol" value="http"/>
     <add key="HostName" value="localhost"/>
     <add key="Port" value="2310"/>
+    <add key="SecurePort" value="2410"/>
     <add key="Folder" value="common"/>
   </appSettings>
 </configuration>
diff --git a/dotnet/test/common/CookieImplementationTest.cs b/dotnet/test/common/CookieImplementationTest.cs
@@ -426,7 +426,7 @@ public void ShouldRetainCookieExpiry()
         }
 
         [Test]
-        [IgnoreBrowser(Browser.IE, "Browser requires additional TLS settings to get secure cookies")]
+        [IgnoreBrowser(Browser.IE, "Browser does not handle untrusted SSL certificates.")]
         [IgnoreBrowser(Browser.PhantomJS, "Untested browser")]
         [IgnoreBrowser(Browser.Safari, "Untested browser")]
         public void ShouldRetainCookieSecure()

diff --git a/dotnet/test/common/Environment/UrlBuilder.cs b/dotnet/test/common/Environment/UrlBuilder.cs
@@ -11,6 +11,7 @@ public class UrlBuilder
         string protocol;
         string hostName;
         string port;
+        string securePort;
         string path;
         string alternateHostName;
 
@@ -34,6 +35,7 @@ public UrlBuilder()
             protocol = EnvironmentManager.GetSettingValue("Protocol");
             hostName = EnvironmentManager.GetSettingValue("HostName");
             port = EnvironmentManager.GetSettingValue("Port");
+            securePort = EnvironmentManager.GetSettingValue("SecurePort");
             // TODO(andre.nogueira): Remove trailing / from folder
             path = EnvironmentManager.GetSettingValue("Folder");
             //Use the first IPv4 address that we find
@@ -76,7 +78,7 @@ public string WhereElseIs(string page)
         public string WhereIsSecure(string page)
         {
             string location = string.Empty;
-            location = "https://" + hostName + ":" + port + "/" + path + "/" + page;
+            location = "https://" + hostName + ":" + securePort + "/" + path + "/" + page;
 
             return location;
         }

diff --git a/dotnet/test/firefox/WebDriver.Firefox.Tests.config b/dotnet/test/firefox/WebDriver.Firefox.Tests.config
@@ -9,6 +9,7 @@
     <add key="Protocol" value="http"/>
     <add key="HostName" value="localhost"/>
     <add key="Port" value="2310"/>
+    <add key="SecurePort" value="2410"/>
     <add key="Folder" value="common"/>
   </appSettings>
 </configuration>
diff --git a/dotnet/test/ie/WebDriver.IE.Tests.config b/dotnet/test/ie/WebDriver.IE.Tests.config
@@ -9,6 +9,7 @@
 		<add key="Protocol" value="http"/>
 		<add key="HostName" value="localhost"/>
 		<add key="Port" value="2310"/>
+		<add key="SecurePort" value="2410"/>
 		<add key="Folder" value="common"/>
 	</appSettings>
 </configuration>
diff --git a/dotnet/test/opera/WebDriver.Opera.Tests.config b/dotnet/test/opera/WebDriver.Opera.Tests.config
@@ -8,7 +8,9 @@
 
     <add key="Protocol" value="http"/>
     <add key="HostName" value="localhost"/>
+		<add key="SecurePort" value="2410"/>
     <add key="Port" value="2310"/>
+    <add key="SecurePort" value="2410"/>
     <add key="Folder" value="common"/>
   </appSettings>
 </configuration>
diff --git a/dotnet/test/phantomjs/WebDriver.PhantomJS.Tests.config b/dotnet/test/phantomjs/WebDriver.PhantomJS.Tests.config
@@ -9,6 +9,7 @@
 		<add key="Protocol" value="http"/>
 		<add key="HostName" value="localhost"/>
 		<add key="Port" value="2310"/>
-		<add key="Folder" value="common"/>
+    <add key="SecurePort" value="2410"/>
+    <add key="Folder" value="common"/>
 	</appSettings>
 </configuration>
diff --git a/dotnet/test/remote/WebDriver.Remote.Tests.config b/dotnet/test/remote/WebDriver.Remote.Tests.config
@@ -10,6 +10,7 @@
     <add key="Protocol" value="http"/>
     <add key="HostName" value="localhost"/>
     <add key="Port" value="2310"/>
+    <add key="SecurePort" value="2410"/>
     <add key="Folder" value="common"/>
   </appSettings>
 </configuration>
diff --git a/dotnet/test/safari/WebDriver.Safari.Tests.config b/dotnet/test/safari/WebDriver.Safari.Tests.config
@@ -9,6 +9,7 @@
 		<add key="Protocol" value="http"/>
 		<add key="HostName" value="localhost"/>
 		<add key="Port" value="2310"/>
-		<add key="Folder" value="common"/>
+    <add key="SecurePort" value="2410"/>
+    <add key="Folder" value="common"/>
 	</appSettings>
 </configuration>