More CancellationToken updates

Author: sadukie

tests/FunctionalTests/Web/Controllers/CatalogControllerIndex.cs

@@ -3,22 +3,17 @@
 namespace Microsoft.eShopWeb.FunctionalTests.Web.Controllers;
 
 [Collection("Sequential")]
-public class CatalogControllerIndex : IClassFixture<TestApplication>
+public class CatalogControllerIndex(TestApplication factory) : IClassFixture<TestApplication>
 {
-    public CatalogControllerIndex(TestApplication factory)
-    {
-        Client = factory.CreateClient();
-    }
-
-    public HttpClient Client { get; }
+    public HttpClient Client { get; } = factory.CreateClient();
 
     [Fact]
     public async Task ReturnsHomePageWithProductListing()
     {
         // Arrange & Act
-        var response = await Client.GetAsync("/");
+        var response = await Client.GetAsync("/", TestContext.Current.CancellationToken);
         response.EnsureSuccessStatusCode();
-        var stringResponse = await response.Content.ReadAsStringAsync();
+        var stringResponse = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
 
         // Assert
         Assert.Contains(".NET Bot Black Sweatshirt", stringResponse);

tests/FunctionalTests/Web/Controllers/OrderControllerIndex.cs

@@ -20,7 +20,7 @@ public OrderIndexOnGet(TestApplication factory)
     [Fact]
     public async Task ReturnsRedirectGivenAnonymousUser()
     {
-        var response = await Client.GetAsync("/order/my-orders");
+        var response = await Client.GetAsync("/order/my-orders", TestContext.Current.CancellationToken);
         var redirectLocation = response!.Headers.Location!.OriginalString;
 
         Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);

tests/FunctionalTests/Web/Pages/Basket/CheckoutTest.cs

@@ -21,46 +21,46 @@ public async Task SucessfullyPay()
     {
 
         // Load Home Page
-        var response = await Client.GetAsync("/");
+        var response = await Client.GetAsync("/", TestContext.Current.CancellationToken);
         response.EnsureSuccessStatusCode();
-        var stringResponse = await response.Content.ReadAsStringAsync();
+        var stringResponse = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
 
         // Add Item to Cart
         var keyValues = new List<KeyValuePair<string, string>>
         {
-            new KeyValuePair<string, string>("id", "2"),
-            new KeyValuePair<string, string>("name", "shirt"),
-            new KeyValuePair<string, string>("price", "19.49"),
-            new KeyValuePair<string, string>(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringResponse))
+           new("id", "2"),
+           new("name", "shirt"),
+           new("price", "19.49"),
+           new(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(stringResponse))
         };
         var formContent = new FormUrlEncodedContent(keyValues);
-        var postResponse = await Client.PostAsync("/basket/index", formContent);
+        var postResponse = await Client.PostAsync("/basket/index", formContent, TestContext.Current.CancellationToken);
         postResponse.EnsureSuccessStatusCode();
-        var stringPostResponse = await postResponse.Content.ReadAsStringAsync();
+        var stringPostResponse = await postResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
         Assert.Contains(".NET Black &amp; White Mug", stringPostResponse);
 
         //Load login page
-        var loginResponse = await Client.GetAsync("/Identity/Account/Login");
+        var loginResponse = await Client.GetAsync("/Identity/Account/Login", TestContext.Current.CancellationToken);
         var longinKeyValues = new List<KeyValuePair<string, string>>
         {
-            new KeyValuePair<string, string>("email", "[email protected]"),
-            new KeyValuePair<string, string>("password", "Pass@word1"),
-            new KeyValuePair<string, string>(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(await loginResponse.Content.ReadAsStringAsync()))
+           new("email", "[email protected]"),
+           new("password", "Pass@word1"),
+           new(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(await loginResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken)))
         };
         var loginFormContent = new FormUrlEncodedContent(longinKeyValues);
-        var loginPostResponse = await Client.PostAsync("/Identity/Account/Login?ReturnUrl=%2FBasket%2FCheckout", loginFormContent);
-        var loginStringResponse = await loginPostResponse.Content.ReadAsStringAsync();
+        var loginPostResponse = await Client.PostAsync("/Identity/Account/Login?ReturnUrl=%2FBasket%2FCheckout", loginFormContent, TestContext.Current.CancellationToken);
+        var loginStringResponse = await loginPostResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
 
         //Basket checkout (Pay now)
         var checkOutKeyValues = new List<KeyValuePair<string, string>>
         {
-            new KeyValuePair<string, string>("Items[0].Id", "2"),
-            new KeyValuePair<string, string>("Items[0].Quantity", "1"),
-            new KeyValuePair<string, string>(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(loginStringResponse))
+           new("Items[0].Id", "2"),
+           new("Items[0].Quantity", "1"),
+           new(WebPageHelpers.TokenTag, WebPageHelpers.GetRequestVerificationToken(loginStringResponse))
         };
         var checkOutContent = new FormUrlEncodedContent(checkOutKeyValues);     
-        var checkOutResponse = await Client.PostAsync("/basket/checkout", checkOutContent);
-        var stringCheckOutResponse = await checkOutResponse.Content.ReadAsStringAsync();
+        var checkOutResponse = await Client.PostAsync("/basket/checkout", checkOutContent, TestContext.Current.CancellationToken);
+        var stringCheckOutResponse = await checkOutResponse.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
 
         Assert.Contains("/Basket/Success", checkOutResponse.RequestMessage!.RequestUri!.ToString());
         Assert.Contains("Thanks for your Order!", stringCheckOutResponse);