Adding support for authentication dialogs in the .NET bindings

jimevans · jimevans · commit ca03a1df884b · 2015-07-14T16:52:06.000-04:00
This commit includes adding tests for the new authentication
functionality.
diff --git a/dotnet/src/webdriver/IAlert.cs b/dotnet/src/webdriver/IAlert.cs
@@ -47,5 +47,12 @@ public interface IAlert
         /// </summary>
         /// <param name="keysToSend">The keystrokes to send.</param>
         void SendKeys(string keysToSend);
+
+        /// <summary>
+        /// Sets the user name and password in an alert prompting for credentials.
+        /// </summary>
+        /// <param name="userName">The user name to set.</param>
+        /// <param name="password">The password to set.</param>
+        void SetAuthenticationCredentials(string userName, string password);
     }
 }
diff --git a/dotnet/src/webdriver/Remote/CommandInfoRepository.cs b/dotnet/src/webdriver/Remote/CommandInfoRepository.cs
@@ -189,6 +189,7 @@ private void InitializeCommandDictionary()
             this.commandDictionary.Add(DriverCommand.AcceptAlert, new CommandInfo(CommandInfo.PostCommand, "/session/{sessionId}/accept_alert"));
             this.commandDictionary.Add(DriverCommand.GetAlertText, new CommandInfo(CommandInfo.GetCommand, "/session/{sessionId}/alert_text"));
             this.commandDictionary.Add(DriverCommand.SetAlertValue, new CommandInfo(CommandInfo.PostCommand, "/session/{sessionId}/alert_text"));
+            this.commandDictionary.Add(DriverCommand.SetAlertCredentials, new CommandInfo(CommandInfo.PostCommand, "/session/{sessionId}/alert/credentials"));
             this.commandDictionary.Add(DriverCommand.SetTimeout, new CommandInfo(CommandInfo.PostCommand, "/session/{sessionId}/timeouts"));
             this.commandDictionary.Add(DriverCommand.ImplicitlyWait, new CommandInfo(CommandInfo.PostCommand, "/session/{sessionId}/timeouts/implicit_wait"));
             this.commandDictionary.Add(DriverCommand.SetAsyncScriptTimeout, new CommandInfo(CommandInfo.PostCommand, "/session/{sessionId}/timeouts/async_script"));
diff --git a/dotnet/src/webdriver/Remote/DriverCommand.cs b/dotnet/src/webdriver/Remote/DriverCommand.cs
@@ -318,6 +318,11 @@ public static class DriverCommand
         /// </summary>
         public static readonly string SetAlertValue = "setAlertValue";
 
+        /// <summary>
+        /// Represents the Authenticate command
+        /// </summary>
+        public static readonly string SetAlertCredentials = "setAlertCredentials";
+
         /// <summary>
         /// Represents the ImplicitlyWait command
         /// </summary>
diff --git a/dotnet/src/webdriver/Remote/RemoteAlert.cs b/dotnet/src/webdriver/Remote/RemoteAlert.cs
@@ -77,6 +77,19 @@ public void SendKeys(string keysToSend)
             parameters.Add("text", keysToSend);
             this.driver.InternalExecute(DriverCommand.SetAlertValue, parameters);
         }
+
+        /// <summary>
+        /// Sets the user name and password in an alert prompting for credentials.
+        /// </summary>
+        /// <param name="userName">The user name to set.</param>
+        /// <param name="password">The password to set.</param>
+        public void SetAuthenticationCredentials(string userName, string password)
+        {
+            Dictionary<string, object> parameters = new Dictionary<string, object>();
+            parameters.Add("username", userName);
+            parameters.Add("password", password);
+            this.driver.InternalExecute(DriverCommand.SetAlertCredentials, parameters);
+        }
         #endregion
     }
 }
diff --git a/dotnet/src/webdriver/UnhandledAlertException.cs b/dotnet/src/webdriver/UnhandledAlertException.cs
@@ -146,6 +146,11 @@ public void SendKeys(string keysToSend)
                 ThrowAlreadyDismissed();
             }
 
+            public void SetAuthenticationCredentials(string userName, string password)
+            {
+                ThrowAlreadyDismissed();
+            }
+
             private static void ThrowAlreadyDismissed()
             {
                 throw new InvalidOperationException("Alert was already dismissed");
diff --git a/dotnet/test/common/AlertsTest.cs b/dotnet/test/common/AlertsTest.cs
@@ -718,6 +718,77 @@ public void ShouldThrowAnExceptionIfAnAlertHasNotBeenDealtWithAndDismissTheAlert
             Assert.AreEqual("Testing Alerts", driver.Title);
         }
 
+        [Test]
+        [Category("JavaScript")]
+        [IgnoreBrowser(Browser.Android)]
+        [IgnoreBrowser(Browser.Chrome)]
+        [IgnoreBrowser(Browser.Firefox)]
+        [IgnoreBrowser(Browser.HtmlUnit)]
+        [IgnoreBrowser(Browser.IPhone)]
+        [IgnoreBrowser(Browser.Opera)]
+        [IgnoreBrowser(Browser.PhantomJS, "Alert commands not yet implemented in GhostDriver")]
+        [IgnoreBrowser(Browser.Remote)]
+        [IgnoreBrowser(Browser.Safari)]
+        [IgnoreBrowser(Browser.WindowsPhone, "Alert handling not yet implemented on Windows Phone")]
+        public void ShouldBeAbleToHandleAuthenticationDialog()
+        {
+            driver.Url = authenticationPage;
+            IAlert alert = WaitFor<IAlert>(AlertToBePresent);
+            alert.SetAuthenticationCredentials("test", "test");
+            alert.Accept();
+            Assert.IsTrue(driver.FindElement(By.TagName("h1")).Text.Contains("authorized"));
+        }
+
+        [Test]
+        [Category("JavaScript")]
+        [IgnoreBrowser(Browser.Android)]
+        [IgnoreBrowser(Browser.Chrome)]
+        [IgnoreBrowser(Browser.Firefox)]
+        [IgnoreBrowser(Browser.HtmlUnit)]
+        [IgnoreBrowser(Browser.IPhone)]
+        [IgnoreBrowser(Browser.Opera)]
+        [IgnoreBrowser(Browser.PhantomJS, "Alert commands not yet implemented in GhostDriver")]
+        [IgnoreBrowser(Browser.Remote)]
+        [IgnoreBrowser(Browser.Safari)]
+        [IgnoreBrowser(Browser.WindowsPhone, "Alert handling not yet implemented on Windows Phone")]
+        public void ShouldBeAbleToDismissAuthenticationDialog()
+        {
+            driver.Url = authenticationPage;
+            IAlert alert = WaitFor<IAlert>(AlertToBePresent);
+            alert.Dismiss();
+        }
+
+        [Test]
+        [Category("JavaScript")]
+        [IgnoreBrowser(Browser.Android)]
+        [IgnoreBrowser(Browser.Chrome)]
+        [IgnoreBrowser(Browser.Firefox)]
+        [IgnoreBrowser(Browser.HtmlUnit)]
+        [IgnoreBrowser(Browser.IPhone)]
+        [IgnoreBrowser(Browser.Opera)]
+        [IgnoreBrowser(Browser.PhantomJS, "Alert commands not yet implemented in GhostDriver")]
+        [IgnoreBrowser(Browser.Remote)]
+        [IgnoreBrowser(Browser.Safari)]
+        [IgnoreBrowser(Browser.WindowsPhone, "Alert handling not yet implemented on Windows Phone")]
+        public void ShouldThrowAuthenticatingOnStandardAlert()
+        {
+            driver.Url = alertsPage;
+            driver.FindElement(By.Id("alert")).Click();
+            IAlert alert = WaitFor<IAlert>(AlertToBePresent);
+            try
+            {
+                alert.SetAuthenticationCredentials("test", "test");
+                Assert.Fail("Should not be able to Authenticate");
+            }
+            catch (UnhandledAlertException)
+            {
+                // this is an expected exception
+            }
+
+            // but the next call should be good.
+            alert.Dismiss();
+        }
+
         private IAlert AlertToBePresent()
         {
             return driver.SwitchTo().Alert();
diff --git a/dotnet/test/common/DriverTestFixture.cs b/dotnet/test/common/DriverTestFixture.cs
@@ -78,6 +78,7 @@ public abstract class DriverTestFixture
         public string slowLoadingAlertPage = EnvironmentManager.Instance.UrlBuilder.WhereIs("slowLoadingAlert.html");
         public string dragDropOverflowPage = EnvironmentManager.Instance.UrlBuilder.WhereIs("dragDropOverflow.html");
         public string missedJsReferencePage = EnvironmentManager.Instance.UrlBuilder.WhereIs("missedJsReference.html");
+        public string authenticationPage = EnvironmentManager.Instance.UrlBuilder.WhereIs("basicAuth");
 
         protected IWebDriver driver;
 
diff --git a/dotnet/test/ie/WebDriver.IE.Tests.csproj b/dotnet/test/ie/WebDriver.IE.Tests.csproj
@@ -84,6 +84,7 @@
   <ItemGroup>
     <None Include="WebDriver.IE.Tests.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </None>
     <None Include="WebDriver.IE.Tests.nunit">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,12 @@ public interface IAlert`
`47`	`47`	`/// </summary>`
`48`	`48`	`/// <param name="keysToSend">The keystrokes to send.</param>`
`49`	`49`	`void SendKeys(string keysToSend);`
	`50`	`+`
	`51`	`+ /// <summary>`
	`52`	`+ /// Sets the user name and password in an alert prompting for credentials.`
	`53`	`+ /// </summary>`
	`54`	`+ /// <param name="userName">The user name to set.</param>`
	`55`	`+ /// <param name="password">The password to set.</param>`
	`56`	`+ void SetAuthenticationCredentials(string userName, string password);`
`50`	`57`	`}`
`51`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,11 @@ public void SendKeys(string keysToSend)`
`146`	`146`	`ThrowAlreadyDismissed();`
`147`	`147`	`}`
`148`	`148`
	`149`	`+ public void SetAuthenticationCredentials(string userName, string password)`
	`150`	`+ {`
	`151`	`+ ThrowAlreadyDismissed();`
	`152`	`+ }`
	`153`	`+`
`149`	`154`	`private static void ThrowAlreadyDismissed()`
`150`	`155`	`{`
`151`	`156`	`throw new InvalidOperationException("Alert was already dismissed");`