diff --git a/src/test/java/school/redrover/ViewWithinFolderTest.java b/src/test/java/school/redrover/ViewWithinFolderTest.java index 99148bb7..f2476999 100644 --- a/src/test/java/school/redrover/ViewWithinFolderTest.java +++ b/src/test/java/school/redrover/ViewWithinFolderTest.java @@ -1,7 +1,6 @@ package school.redrover; import org.testng.Assert; -import org.testng.annotations.Ignore; import org.testng.annotations.Test; import school.redrover.common.BaseTest; import school.redrover.page.HomePage; @@ -43,7 +42,7 @@ public void testPreviewAddDescription() { Assert.assertEquals(actualPreviewText, VIEW_DESCRIPTION); } - @Ignore + @Test(dependsOnMethods = "testPreviewAddDescription") public void testSaveViewDescription() { String actualDescriptionText = new HomePage(getDriver()) @@ -56,7 +55,7 @@ public void testSaveViewDescription() { Assert.assertEquals(actualDescriptionText, VIEW_DESCRIPTION); } - @Ignore + @Test(dependsOnMethods = "testSaveViewDescription") public void testCancelDescription() { String actualDescriptionTest = new HomePage(getDriver()) @@ -74,6 +73,7 @@ public void testOpenEditViewSettings() { String actualViewName = new HomePage(getDriver()) .clickOnProject(FOLDER_NAME, new FolderProjectPage(getDriver())) .clickOnView() + .getSideMenu() .clickEditView() .getViewName(); diff --git a/src/test/java/school/redrover/page/components/BaseSideMenuComponent.java b/src/test/java/school/redrover/page/components/BaseSideMenuComponent.java index d8295ed3..cef6c8e7 100644 --- a/src/test/java/school/redrover/page/components/BaseSideMenuComponent.java +++ b/src/test/java/school/redrover/page/components/BaseSideMenuComponent.java @@ -9,6 +9,7 @@ import school.redrover.page.RenameProjectPage; import school.redrover.page.common.BaseConfigPage; import school.redrover.page.common.BasePage; +import school.redrover.page.view.config.ViewMyConfigPage; public class BaseSideMenuComponent extends BasePage { @@ -24,6 +25,9 @@ public class BaseSideMenuComponent extends BasePage { @FindBy(xpath = "//div[@id='side-panel']//a[contains(@href, '/confirm-rename')]") private WebElement renameButton; + @FindBy(xpath = "//a[contains(@href, '/configure') and .//span[normalize-space()='Edit View']]") + private WebElement editViewButton; + protected final T parentPage; public BaseSideMenuComponent(WebDriver driver, T parentPage) { @@ -57,4 +61,9 @@ public ConfigPage clickConfigure(ConfigPage return configPage; } + + public ViewMyConfigPage clickEditView() { + getWait5().until(ExpectedConditions.elementToBeClickable(editViewButton)).click(); + return new ViewMyConfigPage(getDriver()); + } } diff --git a/src/test/java/school/redrover/page/view/FolderViewPage.java b/src/test/java/school/redrover/page/view/FolderViewPage.java index 3ff51f6e..27de5e3d 100644 --- a/src/test/java/school/redrover/page/view/FolderViewPage.java +++ b/src/test/java/school/redrover/page/view/FolderViewPage.java @@ -5,6 +5,7 @@ import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.page.common.BasePage; +import school.redrover.page.components.BaseSideMenuComponent; import school.redrover.page.view.config.ViewMyConfigPage; public class FolderViewPage extends BasePage { @@ -36,8 +37,15 @@ public class FolderViewPage extends BasePage { @FindBy(css = "#description-edit-form .description-cancel-button") private WebElement buttonCancel; + private final BaseSideMenuComponent baseSideMenu; + public FolderViewPage(WebDriver driver) { super(driver); + this.baseSideMenu = new BaseSideMenuComponent<>(getDriver(), this); + } + + public BaseSideMenuComponent getSideMenu() { + return this.baseSideMenu; } public FolderViewPage addDescription(String expectedDescription){