From b9f5c06b7ccfcba1e06a43475f65b9cfa9f9a3bb Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 25 Mar 2021 09:04:48 +0000 Subject: [PATCH] Fixed unit tests --- .../Rule/Rules/Search/AvailabilityRuleHelper.cs | 7 ++++--- .../page-objects/details/tv/tvdetails.page.ts | 2 ++ .../tests/details/movie/moviedetails-buttons.spec.ts | 4 ++-- .../tests/details/tv/tvdetails-requests-grid.spec.ts | 11 ++++++++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs b/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs index f1262623f..47088b894 100644 --- a/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs +++ b/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs @@ -17,7 +17,7 @@ namespace Ombi.Core.Rule.Rules.Search { // If we have all the episodes for this season, then this season is available if (season.Episodes.All(x => x.Available)) - { + { season.SeasonAvailable = true; } } @@ -28,8 +28,9 @@ namespace Ombi.Core.Rule.Rules.Search else if (search.SeasonRequests.Any(x => x.Episodes.Any(e => e.Available))) { search.PartlyAvailable = true; - } - else + } + + if (!search.FullyAvailable) { var airedButNotAvailable = search.SeasonRequests.Any(x => x.Episodes.Any(c => !c.Available && c.AirDate <= DateTime.Now.Date && c.AirDate != DateTime.MinValue)); diff --git a/tests/cypress/integration/page-objects/details/tv/tvdetails.page.ts b/tests/cypress/integration/page-objects/details/tv/tvdetails.page.ts index 4d81051bb..81de64e4e 100644 --- a/tests/cypress/integration/page-objects/details/tv/tvdetails.page.ts +++ b/tests/cypress/integration/page-objects/details/tv/tvdetails.page.ts @@ -1,4 +1,5 @@ import { BasePage } from "../../base.page"; +import { AdminRequestDialog } from "../../shared/AdminRequestDialog"; class TvRequestPanel { @@ -82,6 +83,7 @@ class TvDetailsPage extends BasePage { informationPanel = new TvDetailsInformationPanel(); requestFabButton = new RequestFabButton(); requestPanel = new TvRequestPanel(); + adminOptionsDialog = new AdminRequestDialog(); constructor() { super(); diff --git a/tests/cypress/tests/details/movie/moviedetails-buttons.spec.ts b/tests/cypress/tests/details/movie/moviedetails-buttons.spec.ts index 4de8243db..a125ffee6 100644 --- a/tests/cypress/tests/details/movie/moviedetails-buttons.spec.ts +++ b/tests/cypress/tests/details/movie/moviedetails-buttons.spec.ts @@ -84,13 +84,13 @@ describe("Movie Details Buttons", () => { it("Movie Requested, mark as available", () => { cy.login(); - Page.visit("399566"); + Page.visit("12444"); Page.requestButton.click(); Page.adminOptionsDialog.isOpen(); Page.adminOptionsDialog.requestButton.click(); cy.verifyNotification( - "Godzilla vs. Kong (2021) has been successfully added" + "Harry Potter and the Deathly Hallows: Part 1 (2010) has been successfully added" ); cy.reload(); diff --git a/tests/cypress/tests/details/tv/tvdetails-requests-grid.spec.ts b/tests/cypress/tests/details/tv/tvdetails-requests-grid.spec.ts index deff3491c..a91a339fb 100644 --- a/tests/cypress/tests/details/tv/tvdetails-requests-grid.spec.ts +++ b/tests/cypress/tests/details/tv/tvdetails-requests-grid.spec.ts @@ -137,6 +137,9 @@ describe("TV Requests Grid", function () { Page.requestFabButton.fab.click(); Page.requestFabButton.requestSelected.click(); + Page.adminOptionsDialog.isOpen(); + Page.adminOptionsDialog.requestButton.click(); + cy.verifyNotification('Request for Game of Thrones has been added successfully'); Page.requestPanel.getEpisodeStatus(2,1) @@ -157,6 +160,9 @@ describe("TV Requests Grid", function () { Page.requestFabButton.fab.click(); Page.requestFabButton.requestFirst.click(); + Page.adminOptionsDialog.isOpen(); + Page.adminOptionsDialog.requestButton.click(); + cy.verifyNotification('Request for Game of Thrones has been added successfully'); Page.requestPanel.getEpisodeStatus(1) @@ -164,12 +170,15 @@ describe("TV Requests Grid", function () { .should('have.class', 'requested') }); - it("Request Latest Season", () => { + it.only("Request Latest Season", () => { Page.visit('1399'); Page.requestFabButton.fab.click(); Page.requestFabButton.requestLatest.click(); + Page.adminOptionsDialog.isOpen(); + Page.adminOptionsDialog.requestButton.click(); + cy.verifyNotification('Request for Game of Thrones has been added successfully'); Page.requestPanel.seasonTab(8)