diff --git a/.github/workflows/main_stpfoodblazor.yml b/.github/workflows/main_stpfoodblazor.yml index 793b6b8..5b1edaa 100644 --- a/.github/workflows/main_stpfoodblazor.yml +++ b/.github/workflows/main_stpfoodblazor.yml @@ -23,7 +23,7 @@ jobs: - name: Build run: dotnet build --no-restore - name: Test - run: dotnet test --filter FullyQualifiedName\!~StpFoodBlazorTest.Integration --verbosity normal + run: dotnet test --filter DisplayName\!~Integration build: runs-on: windows-latest needs: test diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index be67bf9..ebd87ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,4 +25,4 @@ jobs: - name: Build run: dotnet build --no-restore - name: Test - run: dotnet test --no-build --filter FullyQualifiedName\!~StpFoodBlazorTest.Integration --verbosity normal --collect "XPlat Code Coverage" + run: dotnet test --no-build --filter DisplayName\!~Integration --collect "XPlat Code Coverage" diff --git a/StpFoodBlazor/StpFoodBlazor/Helpers/DealFilter.cs b/StpFoodBlazor/StpFoodBlazor/Helpers/DealFilter.cs index 9193e5f..650ae2f 100644 --- a/StpFoodBlazor/StpFoodBlazor/Helpers/DealFilter.cs +++ b/StpFoodBlazor/StpFoodBlazor/Helpers/DealFilter.cs @@ -81,8 +81,8 @@ private static DealEvent[] FilterByHappyHour(DealEvent[] deals, Boolean happyHou private static DealEvent[] FilterByEndAndStartDates(DealEvent[] deals) { return deals.Where(deal => - (string.IsNullOrEmpty(deal.End) || DateTime.Parse(deal.End) >= DateTime.Now) && - (string.IsNullOrEmpty(deal.Start) || DateTime.Parse(deal.Start) <= DateTime.Now) + (string.IsNullOrEmpty(deal.End) || DateTime.Parse(deal.End) >= DateTime.Now.Date) && + (string.IsNullOrEmpty(deal.Start) || DateTime.Parse(deal.Start) <= DateTime.Now.Date) ).ToArray(); } } diff --git a/StpFoodBlazor/StpFoodBlazorTest/Helpers/DealFilterTest.cs b/StpFoodBlazor/StpFoodBlazorTest/Helpers/DealFilterTest.cs index fa22798..4cccee3 100644 --- a/StpFoodBlazor/StpFoodBlazorTest/Helpers/DealFilterTest.cs +++ b/StpFoodBlazor/StpFoodBlazorTest/Helpers/DealFilterTest.cs @@ -147,6 +147,25 @@ public void ShouldReturnFilteredByHappyHourFalse() { Assert.True(string.IsNullOrWhiteSpace(deal.HappyHour))); } + [Fact] + public void ShouldShowDealsThatAreOneDayOnly() + { + filter.Deals = new DealEvent[] { + new DealEvent { + Name = "Pino's Pizza", + Day = DateTime.Now.DayOfWeek.ToString(), + Deal = "Free Oone day only", + Start = DateTime.Now.ToString("MM/dd/yyyy"), + End = DateTime.Now.ToString("MM/dd/yyyy") + } + }; + filter.Day = DateTime.Now.DayOfWeek.ToString(); + + DealEvent[] filteredDeals = filter.Filter(); + + Assert.Single(filteredDeals); + } + [Fact] public void ShouldFilterDealsThatEnded() { filter.HappyHour = true;