Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/test/java/school/redrover/ViewWithinFolderTest.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -43,7 +42,7 @@ public void testPreviewAddDescription() {
Assert.assertEquals(actualPreviewText, VIEW_DESCRIPTION);
}

@Ignore

@Test(dependsOnMethods = "testPreviewAddDescription")
public void testSaveViewDescription() {
String actualDescriptionText = new HomePage(getDriver())
Expand All @@ -56,7 +55,7 @@ public void testSaveViewDescription() {
Assert.assertEquals(actualDescriptionText, VIEW_DESCRIPTION);
}

@Ignore

@Test(dependsOnMethods = "testSaveViewDescription")
public void testCancelDescription() {
String actualDescriptionTest = new HomePage(getDriver())
Expand All @@ -74,6 +73,7 @@ public void testOpenEditViewSettings() {
String actualViewName = new HomePage(getDriver())
.clickOnProject(FOLDER_NAME, new FolderProjectPage(getDriver()))
.clickOnView()
.getSideMenu()
.clickEditView()
.getViewName();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<T extends BasePage> extends BasePage {

Expand All @@ -24,6 +25,9 @@ public class BaseSideMenuComponent<T extends BasePage> 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) {
Expand Down Expand Up @@ -57,4 +61,9 @@ public <ConfigPage extends BaseConfigPage> ConfigPage clickConfigure(ConfigPage

return configPage;
}

public ViewMyConfigPage clickEditView() {
getWait5().until(ExpectedConditions.elementToBeClickable(editViewButton)).click();
return new ViewMyConfigPage(getDriver());
}
}
Copy link
Copy Markdown
Collaborator

@NadiaSergeeva NadiaSergeeva Jun 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tебе нужно создать новый компонент для вью, отнаследовав его от BaseSideMenuComponent (и добавить туда Edit View и Delete View). Базовый - это то,что есть у всех. А Edit View есть только у вью

8 changes: 8 additions & 0 deletions src/test/java/school/redrover/page/view/FolderViewPage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -36,8 +37,15 @@ public class FolderViewPage extends BasePage {
@FindBy(css = "#description-edit-form .description-cancel-button")
private WebElement buttonCancel;

private final BaseSideMenuComponent<FolderViewPage> baseSideMenu;

public FolderViewPage(WebDriver driver) {
super(driver);
this.baseSideMenu = new BaseSideMenuComponent<>(getDriver(), this);
}

public BaseSideMenuComponent<FolderViewPage> getSideMenu() {
return this.baseSideMenu;
}

public FolderViewPage addDescription(String expectedDescription){
Expand Down
Loading