From 7b8ace548986bfb4313a6cff94e3ffd4566df5f4 Mon Sep 17 00:00:00 2001
From: Praburaj <praburaj.t@microsoft.com>
Date: Tue, 3 Mar 2015 16:49:00 -0800
Subject: [PATCH] Re-enable the Ntlm authentication tests

User.IsSignedIn() does not return true for NTLM. So pulling the NTLM check out of the code block.
---
 .../Views/Shared/_LoginPartial.cshtml         | 31 +++++++++----------
 test/E2ETests/NtlmAuthentationTest.cs         |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/MusicStore/Views/Shared/_LoginPartial.cshtml b/src/MusicStore/Views/Shared/_LoginPartial.cshtml
index b539905a3b..6abadf073f 100644
--- a/src/MusicStore/Views/Shared/_LoginPartial.cshtml
+++ b/src/MusicStore/Views/Shared/_LoginPartial.cshtml
@@ -2,31 +2,28 @@
 
 @if (User.IsSignedIn())
 {
-    //Either NTLM will be used or social authentication will be used. Based on the authentication schemes enabled remove an unused block.
-    if (User.Identity.AuthenticationType != "NTLM")
+    using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "logoutForm", @class = "navbar-right" }))
     {
-        using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "logoutForm", @class = "navbar-right" }))
-        {
-            @Html.AntiForgeryToken()
+        @Html.AntiForgeryToken()
 
-            <ul class="nav navbar-nav navbar-right">
-                <li>
-                    @Html.ActionLink("Hello " + User.GetUserName() + "!", "Index", "Manage", routeValues: null, htmlAttributes: new { title = "Manage" })
-                </li>
-                <li><a href="javascript:document.getElementById('logoutForm').submit()">Log off</a></li>
-            </ul>
-        }
-    }
-    else
-    {
-        //This code block necessary only for NTLM authentication
         <ul class="nav navbar-nav navbar-right">
             <li>
-                <p class="nav navbar-text navbar-right">Hello, @User.GetUserName()!</p>
+                @Html.ActionLink("Hello " + User.GetUserName() + "!", "Index", "Manage", routeValues: null, htmlAttributes: new { title = "Manage" })
             </li>
+            <li><a href="javascript:document.getElementById('logoutForm').submit()">Log off</a></li>
         </ul>
     }
 }
+//Either NTLM will be used or social authentication will be used. Based on the authentication schemes enabled remove an unused block.
+else if (User.Identity.IsAuthenticated && User.Identity.AuthenticationType == "NTLM")
+{
+    //This code block necessary only for NTLM authentication
+    <ul class="nav navbar-nav navbar-right">
+        <li>
+            <p class="nav navbar-text navbar-right">Hello, @User.GetUserName()!</p>
+        </li>
+    </ul>
+}
 else
 {
     <ul class="nav navbar-nav navbar-right">
diff --git a/test/E2ETests/NtlmAuthentationTest.cs b/test/E2ETests/NtlmAuthentationTest.cs
index 0f72adcda2..2863fe42ca 100644
--- a/test/E2ETests/NtlmAuthentationTest.cs
+++ b/test/E2ETests/NtlmAuthentationTest.cs
@@ -10,7 +10,7 @@ namespace E2ETests
 {
     public partial class SmokeTests
     {
-        [ConditionalTheory(Skip = "Auth changes broke this, haok investigating")]
+        [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Unix | OperatingSystems.MacOSX)]
         //[InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5001/")]
         [InlineData(ServerType.IISExpress, RuntimeFlavor.DesktopClr, RuntimeArchitecture.amd64, "http://localhost:5001/")]