Add Signout integration test

Author: andycunningham-airelogic

src/SchoolAccount.Web.Mvc/Authentication/Extensions/ServiceCollectionExtensions.cs

@@ -35,7 +35,7 @@ IConfigurationManager configuration
             .AddCookie(options =>
             {
                 options.LoginPath = "/";
-                options.LogoutPath = "/account/signout";
+                options.LogoutPath = "/account/logout";
                 options.AccessDeniedPath = "/error/403";
                 options.Cookie.SecurePolicy = CookieSecurePolicy.Always;
                 options.Cookie.Name = "sa-cookie";
@@ -54,7 +54,7 @@ IConfigurationManager configuration
                     settings.SignedOutCallbackPath
                 )
                     ? settings.SignedOutCallbackPath
-                    : "/account/signedout";
+                    : "/account/loggedout";
 
                 options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
                 options.ResponseType = OpenIdConnectResponseType.IdToken;

src/SchoolAccount.Web.Mvc/Features/Accounts/AccountController.cs

@@ -10,7 +10,7 @@ namespace SchoolAccount.Web.Mvc.Features.Accounts;
 public class AccountController : Controller
 {
     [HttpPost]
-    public IActionResult SignIn(Uri? returnUrl = null)
+    public IActionResult Login(Uri? returnUrl = null)
     {
         returnUrl ??= new Uri(
             Url.Action("Dashboard", "Dashboard")
@@ -30,7 +30,7 @@ public IActionResult SignIn(Uri? returnUrl = null)
     }
 
     [HttpPost]
-    public new IActionResult SignOut()
+    public IActionResult Logout()
     {
         if (!(User.Identity?.IsAuthenticated ?? false))
         {
@@ -46,7 +46,7 @@ public IActionResult SignIn(Uri? returnUrl = null)
     }
 
     [HttpGet]
-    public IActionResult SignedOut()
+    public IActionResult LoggedOut()
     {
         HttpContext.Session.Clear();
 

src/SchoolAccount.Web.Mvc/Features/Error/ErrorController.cs

@@ -18,6 +18,7 @@ public IActionResult Error(HttpStatusCode statusCode)
         );
 
         var errorViewModel = new ErrorViewModel(statusCode);
+        Response.StatusCode = (int)errorViewModel.StatusCode;
 
         return View(errorViewModel);
     }

src/SchoolAccount.Web.Mvc/Features/Shared/_Layout.cshtml

@@ -25,7 +25,7 @@
                 </a>
                 @if (isAuthenticated)
                 {
-                    using (Html.BeginForm("SignOut", "Account", FormMethod.Post))
+                    using (Html.BeginForm("Logout", "Account", FormMethod.Post))
                     {
                         <button role="button" type="submit" class="govuk-link dfe-school-account-header__signout">
                             Sign out

src/SchoolAccount.Web.Mvc/Features/Start/Start.cshtml

@@ -7,7 +7,7 @@
     Login with a DSI Account to access your School Account.
 </p>
 
-@using (Html.BeginForm("SignIn", "Account", FormMethod.Post))
+@using (Html.BeginForm("Login", "Account", FormMethod.Post))
 {
     <input type="hidden" name="returnUrl" value="@Model.GoTo" />
     <button type="submit" role="button" class="govuk-button">

tests/SchoolAccount.IntegrationTests/Common/AngleSharpPage.cs

@@ -3,33 +3,54 @@
 
 namespace SchoolAccount.IntegrationTests.Common;
 
-public class AngleSharpPage
+public abstract class AngleSharpPage
 {
-    private readonly IDocument _page;
+    protected IDocument Page;
 
-    public AngleSharpPage(string pageContent)
+    protected AngleSharpPage() { }
+
+    protected AngleSharpPage(string pageContent)
+    {
+        Initialise(pageContent);
+    }
+
+    protected void Initialise(string pageContent)
     {
         var context = BrowsingContext.New(Configuration.Default);
-        _page = context
+        Page = context
             .OpenAsync(req => req.Content(pageContent), TestContext.Current.CancellationToken)
             .Result;
     }
 
-    public string? GetTitle()
+    public static async Task<T> FromResponseAsync<T>(
+        HttpResponseMessage responseMessage,
+        CancellationToken cancellationToken = default
+    )
+        where T : AngleSharpPage, new()
+    {
+        var html = await responseMessage.Content.ReadAsStringAsync(cancellationToken);
+
+        var page = new T();
+        page.Initialise(html);
+
+        return page;
+    }
+
+    public virtual string? GetTitle()
     {
-        var pageTitle = _page.QuerySelector("title");
+        var pageTitle = Page.QuerySelector("title");
         return pageTitle?.TextContent;
     }
 
-    public string? GetFirstHeading()
+    public virtual string? GetFirstHeading()
     {
-        var headingElement = _page.QuerySelector("h1.govuk-heading-l");
+        var headingElement = Page.QuerySelector("h1.govuk-heading-l");
         return headingElement?.TextContent;
     }
 
-    public string? GetFirstBody()
+    public virtual string? GetFirstBody()
     {
-        var bodyElement = _page.QuerySelector("body");
+        var bodyElement = Page.QuerySelector("body");
         return bodyElement?.TextContent;
     }
 }

tests/SchoolAccount.IntegrationTests/Common/ClientOptions.cs

@@ -0,0 +1,8 @@
+namespace SchoolAccount.IntegrationTests.Common;
+
+public class ClientOptions
+{
+    public bool AllowAutoRedirect { get; init; }
+
+    public static readonly ClientOptions AllowRedirects = new() { AllowAutoRedirect = true };
+}

tests/SchoolAccount.IntegrationTests/Common/MockAuthHandler.cs

@@ -9,7 +9,7 @@ public class MockAuthHandler(
     IOptionsMonitor<AuthenticationSchemeOptions> options,
     ILoggerFactory logger,
     UrlEncoder encoder
-) : AuthenticationHandler<AuthenticationSchemeOptions>(options, logger, encoder)
+) : SignOutAuthenticationHandler<AuthenticationSchemeOptions>(options, logger, encoder)
 {
     public const string SchemeName = "AuthScheme";
 
@@ -37,4 +37,9 @@ protected override Task HandleChallengeAsync(AuthenticationProperties? propertie
         Response.Redirect(properties?.RedirectUri ?? "/");
         return Task.CompletedTask;
     }
+
+    protected override Task HandleSignOutAsync(AuthenticationProperties? properties)
+    {
+        return Task.CompletedTask;
+    }
 }

tests/SchoolAccount.IntegrationTests/Common/Pages/CommonPage.cs

@@ -0,0 +1,6 @@
+namespace SchoolAccount.IntegrationTests.Common.Pages;
+
+/// <remarks>
+/// This will be replaced with their own pages eventually
+/// </remarks>
+public class CommonPage : AngleSharpPage { }

tests/SchoolAccount.IntegrationTests/Common/Pages/ErrorPage.cs

@@ -0,0 +1,27 @@
+using SchoolAccount.Web.Mvc.Features.Error;
+
+namespace SchoolAccount.IntegrationTests.Common.Pages;
+
+public class ErrorPage : AngleSharpPage
+{
+    public bool IsNotFoundPageTitle()
+    {
+        var pageTitle = GetTitle();
+
+        return pageTitle?.Equals(ErrorViewModel.NotFoundTitle, StringComparison.Ordinal) == true;
+    }
+
+    public bool IsNotFoundPageHeading()
+    {
+        var pageHeading = GetFirstHeading();
+
+        return pageHeading?.Equals("Page not found", StringComparison.Ordinal) == true;
+    }
+
+    public bool IsServerErrorPageTitle()
+    {
+        var pageTitle = GetTitle();
+
+        return pageTitle?.Equals(ErrorViewModel.ErrorTitle, StringComparison.Ordinal) == true;
+    }
+}