fix

Author: behdad088

src/Services/Basket/Basket.API.IntegrationTests/ApiSpecification.cs

@@ -16,7 +16,6 @@ public class GetWebApiContainerFactory : ICollectionFixture<ApiSpecification>
 }
 public class ApiSpecification : IAsyncLifetime
 {
-    private readonly CancellationTokenSource _timeoutCancellationTokenSource = new(TimeSpan.FromSeconds(40));
     private IDistributedCache? _cache;
     private WireMockServer? _discountWireMockServer;
     private ApiFactory? _factory;
@@ -31,7 +30,6 @@ internal HttpClient HttpClient
         get
         { 
             var client = _httpClient ??= _factory!.CreateClient();
-            _httpClient.Timeout = TimeSpan.FromMinutes(2);
             client.ClearDefaultHeaders();
             return client;
         }
@@ -41,7 +39,10 @@ internal HttpClient HttpClient
         _postgresDataSeeder ??= new PostgresDataSeeder(GetDocumentStore());
 
     internal RedisDataSeeder RedisDataSeeder => _redisDataSeeder ??= new RedisDataSeeder(GetCache());
-    internal CancellationToken CancellationToken => _timeoutCancellationTokenSource.Token;
+    internal CancellationToken CreateTimeoutToken(int seconds = 120)
+    {
+        return new CancellationTokenSource(TimeSpan.FromSeconds(seconds)).Token;
+    }
 
     public void ResetWireMockServer()
     {
@@ -70,7 +71,7 @@ public async Task DisposeAsync()
             await _factory.DisposeAsync();
 
         _httpClient?.Dispose();
-        _store?.Advanced.ResetAllData(CancellationToken);
+        _store?.Advanced.ResetAllData(CreateTimeoutToken());
         _store?.Dispose();
         await _webApiContainer.DisposeAsync();
         _discountWireMockServer?.Stop();

src/Services/Basket/Basket.API.IntegrationTests/Features/DeleteBasket/DeleteBasketTests.cs

@@ -22,7 +22,7 @@ public DeleteBasketTests(ApiSpecification apiSpecification) : base(apiSpecificat
     public async Task DeleteBasket_No_Token_Returns_Unauthorized(string username)
     {
         // Arrange
-        var timeout = _apiSpecification.CancellationToken;
+        var timeout = _apiSpecification.CreateTimeoutToken();
 
         // Act
         var result = await _client
@@ -37,7 +37,7 @@ public async Task DeleteBasket_No_Token_Returns_Unauthorized(string username)
     public async Task DeleteBasket_No_Permission_Returns_Forbidden(string username)
     {
         // Arrange
-        var timeout = _apiSpecification.CancellationToken;
+        var timeout = _apiSpecification.CreateTimeoutToken();
 
         // Act
         var result = await _client
@@ -52,7 +52,7 @@ public async Task DeleteBasket_No_Permission_Returns_Forbidden(string username)
     public async Task DeleteBasket_Deletes_Basket_From_Cache_And_PostgresDb_Returns_Ok()
     {
         // Arrange
-        var timeout = _apiSpecification.CancellationToken;
+        var timeout = _apiSpecification.CreateTimeoutToken();
         var username = "test username 1";
 
         var shoppingCart = new ShoppingCart

src/Services/Basket/Basket.API.IntegrationTests/Features/GetBasket/GetBasketTests.cs

@@ -20,7 +20,7 @@ public GetBasketTests(ApiSpecification apiSpecification) : base(apiSpecification
     public async Task GetBasket_No_Token_Returns_Unauthorized()
     {
         // Arrange
-        var timeout = _apiSpecification.CancellationToken;
+        var timeout = _apiSpecification.CreateTimeoutToken();
         const string username = "test username 1";
 
         // Act
@@ -35,7 +35,7 @@ public async Task GetBasket_No_Token_Returns_Unauthorized()
     public async Task GetBasket_No_Permission_Returns_Forbidden()
     {
         // Arrange
-        var timeout = _apiSpecification.CancellationToken;
+        var timeout = _apiSpecification.CreateTimeoutToken();
         const string username = "test username 1";
 
         // Act
@@ -51,7 +51,7 @@ public async Task GetBasket_No_Permission_Returns_Forbidden()
     public async Task GetBasket_Basket_NotFound_Returns_NotFound()
     {
         // Arrange
-        var timeout = _apiSpecification.CancellationToken;
+        var timeout = _apiSpecification.CreateTimeoutToken();
         const string username = "test username 1";
 
         // Act
@@ -73,7 +73,7 @@ public async Task GetBasket_Basket_NotFound_Returns_NotFound()
     public async Task GetBasket_Basket_Only_Exists_In_Postgres_database_Should_Return_Basket_And_Add_To_Redis()
     {
         // Arrange
-        var timeout = _apiSpecification.CancellationToken;
+        var timeout = _apiSpecification.CreateTimeoutToken();
         const string username = "test username 2";
 
         var shoppingCart = new ShoppingCart
@@ -121,7 +121,7 @@ public async Task GetBasket_Basket_Only_Exists_In_Postgres_database_Should_Retur
     public async Task GetBasket_Basket_Only_Exists_In_Redis_database_Should_Return_Basket()
     {
         // Arrange
-        var timeout = _apiSpecification.CancellationToken;
+        var timeout = _apiSpecification.CreateTimeoutToken();
         const string username = "test username 3";
 
         var shoppingCart = new ShoppingCart

src/Services/Basket/Basket.API.IntegrationTests/Features/StoreBasket/StoreBasketTests.cs

@@ -25,7 +25,7 @@ public StoreBasketTests(ApiSpecification apiSpecification) : base(apiSpecificati
     public async Task StoreBasket_Null_Username_Returns_BadRequest(StoreBasketRequest request)
     {
         // Arrange
-        var token = _apiSpecification.CancellationToken;
+        var token = _apiSpecification.CreateTimeoutToken();
         var invalidRequest =
             new StoreBasketRequest(new BasketDtoRequest(string.Empty, request.ShoppingCart!.Items));
 
@@ -50,7 +50,7 @@ public async Task StoreBasket_Null_Username_Returns_BadRequest(StoreBasketReques
     public async Task StoreBasket_Null_Request_Returns_BadRequest(StoreBasketRequest request)
     {
         // Arrange
-        var token = _apiSpecification.CancellationToken;
+        var token = _apiSpecification.CreateTimeoutToken();
         request = new StoreBasketRequest(null);
 
         // Act
@@ -97,7 +97,7 @@ public async Task StoreBasket_Null_Items_In_Request_Returns_BadRequest(StoreBask
     public async Task StoreBasket_Zero_Quantity_In_Items_In_Request_Returns_BadRequest(StoreBasketRequest request)
     {
         // Arrange
-        var token = _apiSpecification.CancellationToken;
+        var token = _apiSpecification.CreateTimeoutToken();
         var invalidRequest =
             new StoreBasketRequest(new BasketDtoRequest(
                 request.ShoppingCart!.Username,
@@ -123,7 +123,7 @@ public async Task StoreBasket_Zero_Quantity_In_Items_In_Request_Returns_BadReque
     public async Task StoreBasket_Zero_Price_In_Items_In_Request_Returns_BadRequest(StoreBasketRequest request)
     {
         // Arrange
-        var token = _apiSpecification.CancellationToken;
+        var token = _apiSpecification.CreateTimeoutToken();
         var invalidRequest =
             new StoreBasketRequest(new BasketDtoRequest(
                 request.ShoppingCart!.Username,
@@ -149,7 +149,7 @@ public async Task StoreBasket_Zero_Price_In_Items_In_Request_Returns_BadRequest(
     public async Task StoreBasket_Valid_Request_Saves_Data_In_PostgresDb_And_Redis(StoreBasketRequest request)
     {
         // Arrange 
-        var token = _apiSpecification.CancellationToken;
+        var token = _apiSpecification.CreateTimeoutToken();
         _discountGiven.GetDiscountGiven(request.ShoppingCart!.Items!.FirstOrDefault()!.ProductName);
 
         // Act
@@ -183,7 +183,7 @@ public async Task StoreBasket_Valid_Request_Saves_Data_In_PostgresDb_And_Redis(S
     public async Task StoreBasket_Valid_Request_Saves_Data_With_Valid_TotalPrice(StoreBasketRequest request)
     {
         // Arrange 
-        var token = _apiSpecification.CancellationToken;
+        var token = _apiSpecification.CreateTimeoutToken();
         var validRequest = new StoreBasketRequest(new BasketDtoRequest(request.ShoppingCart!.Username,
             new List<BasketItem>
             {