diff --git a/src/test/java/school/redrover/MultibranchPipelineTest.java b/src/test/java/school/redrover/MultibranchPipelineTest.java index 8be0fe5e..c3b718f2 100644 --- a/src/test/java/school/redrover/MultibranchPipelineTest.java +++ b/src/test/java/school/redrover/MultibranchPipelineTest.java @@ -33,34 +33,19 @@ public void testCreate() { Assert.assertEquals(projectList.getFirst(), PROJECT_NAME); } - @Ignore - @Test - public void testStatusIconIsDisplayedForMultibranchPipeline() { - final String projectName = "new-multibranch-pipeline-" + System.currentTimeMillis(); - TestUtils.createJob( - getDriver(), - projectName, - TestUtils.JobType.MULTIBRANCH_PIPELINE); - - getWait10().until(ExpectedConditions.urlContains("/configure")); - getWait10().until(ExpectedConditions.elementToBeClickable(By.className("app-jenkins-logo"))).click(); - - By statusIcon = By.xpath("//tr[.//span[normalize-space()='" + projectName + "']]//*[name()='svg']"); - WebElement icon = getWait10().until(ExpectedConditions.visibilityOfElementLocated(statusIcon)); - Assert.assertTrue(icon.isDisplayed()); - } - @Test(dependsOnMethods = "testCreate") public void testRename() { - getWait10().until(ExpectedConditions.visibilityOfElementLocated(By.xpath("//span[contains(text(),'%s')]".formatted(PROJECT_NAME)))).click(); - getDriver().findElement(By.xpath("//a[contains(@href,'job') and ./span[text()='Rename']]")).click(); - getDriver().findElement(By.xpath("//input[@name='newName']")).clear(); - getDriver().findElement(By.xpath("//input[@name='newName']")).sendKeys(PROJECT_NAME_1); - getDriver().findElement(By.name("Submit")).click(); - getWait5().until(ExpectedConditions.visibilityOfElementLocated(By.className("app-jenkins-logo"))).click(); - - Assert.assertEquals(getWait10().until( - ExpectedConditions.visibilityOfElementLocated(By.xpath("//span[contains(text(),'%s')]".formatted(PROJECT_NAME_1)))).getText(), PROJECT_NAME_1); + List projectList= new HomePage(getDriver()) + .clickOnProject(PROJECT_NAME, new MultibranchProjectPage(getDriver())) + .getSideMenu() + .clickRename() + .setNewProjectName(PROJECT_NAME_1) + .clickRenameButton() + .goHomePage() + .getProjectList(); + + Assert.assertEquals(projectList.size(), 1); + Assert.assertEquals(projectList.getFirst(), PROJECT_NAME_1); } @Test(dependsOnMethods = "testRename")