Skip to content
Merged
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
3 changes: 1 addition & 2 deletions src/test/java/school/redrover/BuildHistoryAccessTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ private Object[][] iconSize() {
public void testQuickAccessBuildHistory() {
String actualHeading = new HomePage(getDriver())
.clickBuildHistory()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualHeading, "Build History of Jenkins");
}
Expand Down
6 changes: 2 additions & 4 deletions src/test/java/school/redrover/ConfigureAppearanceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ public void testSystemThemeAndApplyButtonPopUp() {
.clickAppearanceLink()
.clickSystemTheme()
.clickApplyButton()
.getApplyPopUp()
.getText();
.getApplyPopUpText();

Assert.assertEquals(popUpApplyButtonText, expectedText);
}
Expand Down Expand Up @@ -45,8 +44,7 @@ public void changeThemeLight() {
.clickLightTheme()
.checkAllowTheme()
.clickApplyButton()
.getApplyPopUp()
.getText();
.getApplyPopUpText();

Assert.assertEquals(checkingLight, finalTheme);
}
Expand Down
16 changes: 5 additions & 11 deletions src/test/java/school/redrover/CreateNewItemTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.testng.annotations.Test;
import org.openqa.selenium.JavascriptExecutor;
import school.redrover.common.BaseTest;
import school.redrover.page.FreestyleProjectConfigurationPage;
import school.redrover.page.FreestyleProjectStatusPage;
import school.redrover.page.HomePage;
import school.redrover.page.NewItemPage;
Expand All @@ -24,8 +23,7 @@ public class CreateNewItemTest extends BaseTest {
public void testNewItemPageByClickingCreateAJobLink() {
String result = new HomePage(getDriver())
.clickCreateJob()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(result, "New Item");
}
Expand All @@ -34,8 +32,7 @@ public void testNewItemPageByClickingCreateAJobLink() {
public void testNewItemPageByClickingNewItemLink() {
String result = new HomePage(getDriver())
.clickSidebarNewItem()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(result, "New Item");
}
Expand Down Expand Up @@ -110,8 +107,7 @@ public void testErrorMessageForDuplicateItemNames() {
.clickSidebarNewItem()
.sendName(PROJECT_NAME)
.selectFolder()
.getErrorMessage()
.getText();
.getErrorMessageText();

Assert.assertEquals(errorMessage, "» A job already exists with the name ‘New Project’");
}
Expand All @@ -136,8 +132,7 @@ public void testConfigurationPageIsVisible() {
.clickCreateJob()
.sendName(PROJECT_NAME)
.selectFreestyleProjectAndSubmit()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(headingText, "Configure");
}
Expand Down Expand Up @@ -182,8 +177,7 @@ public void createNewFreeStyleProjectTest() {
.sendName(PROJECT_NAME)
.selectFreestyleProjectAndSubmit()
.clickSave()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(projectTitle, PROJECT_NAME);
}
Expand Down
14 changes: 6 additions & 8 deletions src/test/java/school/redrover/DashboardTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void createProject(String name) {
@Test
public void testHomePageHeading() {
Assert.assertEquals(
new HomePage(getDriver()).waitUntilPageLoadJS().getHeader().getText(),
new HomePage(getDriver()).waitUntilPageLoadJS().getHeaderText(),
"Welcome to Jenkins!"
);
}
Expand Down Expand Up @@ -83,8 +83,7 @@ public void testSearchCreatedJobs() {
.clickSearchButton()
.searchFor(CREATED_JOBS_NAME.get(0))
.moveAndClickResult()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(searchResults, CREATED_JOBS_NAME.get(0));
}
Expand Down Expand Up @@ -125,7 +124,7 @@ public void testStatusProjectIconHasTooltip() {

@Test
public void testLogo() {
String logoText = new HomePage(getDriver()).getLogo().getText();
String logoText = new HomePage(getDriver()).getLogoText();

Assert.assertEquals(logoText, "Jenkins", "Надпись рядом с логотипом должна быть 'Jenkins'");
}
Expand All @@ -136,8 +135,7 @@ public void testGoToManageJenkinsPage() {

String actualTitle = new HomePage(getDriver())
.clickManageJenkinsGear()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualTitle, expectedTitle);
}
Expand Down Expand Up @@ -211,7 +209,7 @@ public void testSetUpAgent() {
NewNodePage newNodePage = new HomePage(getDriver())
.clickSetUpAnAgent();

Assert.assertEquals(newNodePage.getHeader().getText(), "New node");
Assert.assertEquals(newNodePage.getHeaderText(), "New node");
Assert.assertTrue(newNodePage.isFormDisplayed(), "New Node form is not visible");
}

Expand All @@ -220,7 +218,7 @@ public void testConfigureCloudIntegration() {
CloudsPage cloudsPage = new HomePage(getDriver())
.clickConfigureCloud();

Assert.assertEquals(cloudsPage.getHeader().getText(), "Clouds");
Assert.assertEquals(cloudsPage.getHeaderText(), "Clouds");
Assert.assertEquals(cloudsPage.getCloudsPageInfoText(), "There is no plugin installed that supports clouds.");
}
}
2 changes: 2 additions & 0 deletions src/test/java/school/redrover/DescriptionTest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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 All @@ -20,6 +21,7 @@ public void testCreateDescription() {
Assert.assertEquals(actualDescription, description);
}

@Ignore
@Test
public void testAddChangeDescription() {
final String firstDescription = "First text!";
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/school/redrover/FolderManagementTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public void testNavigateToConfigurationViaSideMenuForPipeline() {
.openSubItemPage(itemName, new PipelineProjectStatusPage(getDriver()))
.getSidebarComponent()
.clickSidebarConfigure()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualHeadingText, "Configure");
}
Expand Down
6 changes: 2 additions & 4 deletions src/test/java/school/redrover/FolderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ public void testPreventDuplicateItemNamesInFolder() {
.clickSidebarNewItem()
.sendName(SUB_FOLDER_NAME)
.selectFolder()
.getErrorMessage()
.getText();
.getErrorMessageText();

Assert.assertEquals(
duplicateErrorMessage,
Expand Down Expand Up @@ -214,8 +213,7 @@ public void testRenameFolder() {
.clearName()
.sendNewName(NEW_FOLDER_NAME)
.renameButtonClick()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(newNameFolder, NEW_FOLDER_NAME);
}
Expand Down
20 changes: 7 additions & 13 deletions src/test/java/school/redrover/FooterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ public void testRestApiLink() {
public void testApiPageHeading() {
String actualHeading = new HomePage(getDriver())
.clickRestApiLink()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualHeading, NAME_PAGE);
}
Expand Down Expand Up @@ -55,7 +54,7 @@ public void testRestApiLinkByFocusAndEnter() {

@Test
public void testJenkinsVersion() {
String version = new HomePage(getDriver()).getJenkinsVersionButton().getText();
String version = new HomePage(getDriver()).getJenkinsVersionButtonText();

Assert.assertEquals(version,"Jenkins 2.516.3");
}
Expand All @@ -80,8 +79,7 @@ public void testRestApiUserPage() {
String actualHeading = new HomePage(getDriver())
.clickUserAccountIcon()
.clickRestApiLink()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualHeading, NAME_PAGE);
}
Expand All @@ -91,8 +89,7 @@ public void testRestApiNewItemPage() {
String actualHeading = new HomePage(getDriver())
.clickSidebarNewItem()
.clickRestApiLink()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualHeading, NAME_PAGE);
}
Expand All @@ -102,8 +99,7 @@ public void testRestApiNewNodesPage() {
String actualHeading = new HomePage(getDriver())
.clickSetUpAnAgent()
.clickRestApiLink()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualHeading, NAME_PAGE);
}
Expand All @@ -113,8 +109,7 @@ public void testRestApiNodesPage() {
String actualHeading = new HomePage(getDriver())
.clickBuildExecutorStatus()
.clickRestApiLink()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualHeading, NAME_PAGE);
}
Expand All @@ -124,8 +119,7 @@ public void testRestApiBuildHistoryOfJenkinsPage() {
String actualHeading = new HomePage(getDriver())
.clickBuildHistory()
.clickRestApiLink()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualHeading, NAME_PAGE);
}
Expand Down
24 changes: 10 additions & 14 deletions src/test/java/school/redrover/FreestyleProjectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,11 @@ public void testBuildStepsFilterNames() {
.clickBuildStepMenuOption();

for (String buildStep : BUILD_STEPS) {
String visibleStep = configPage
.typeIntoFilterBuildStep(buildStep.substring(0, Math.min(5, buildStep.length())))
.verifySentNameIsInFilterText(buildStep);

configPage
.typeIntoFilterBuildStep(buildStep.substring(0, Math.min(5, buildStep.length())));

WebElement visibleStep = configPage.verifySentNameIsInFilter(buildStep);

Assert.assertEquals(
visibleStep.getText(),
buildStep,
"Filter didn't match expected build step");
Assert.assertEquals(visibleStep, buildStep, "Filter didn't match expected build step");
}
}

Expand All @@ -134,8 +129,10 @@ public void testBuildSteps() {
.clickBuildStepMenuOption();

for (String step : BUILD_STEPS) {
WebElement buildStep = getDriver().findElement(By.xpath("//button[contains(text(),'%s')]".formatted(step)));
Assert.assertEquals(buildStep.getText(), step);
String buildStepText = new FreestyleProjectConfigurationPage(getDriver())
.getBuildStepText(step);

Assert.assertEquals(buildStepText, step);
}
}

Expand Down Expand Up @@ -270,7 +267,7 @@ public void testDeleteFreestyleProject() {
.clickDeleteItemInDropdownMenu()
.confirmDelete();

Assert.assertEquals(homePage.getHeader().getText(), expectedHeadingText);
Assert.assertEquals(homePage.getHeaderText(), expectedHeadingText);
}

@Test
Expand Down Expand Up @@ -312,8 +309,7 @@ public void testNavigationToWorkspaceAfterBuild() {
.clickSidebarBuildNow()
.getSidebarComponent()
.clickSidebarWorkspace()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualHeadingText, expectedHeadingText);
}
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/school/redrover/JenkinsManagementTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ public void testSearchAndOpenSetting() {
.clickManageJenkinsGear()
.sendTitle(SETTING_TITLE)
.clickSearchResult()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(searchHeading, "System");
}
Expand Down
12 changes: 4 additions & 8 deletions src/test/java/school/redrover/MultiConfigurationProjectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ public void testCreateProject() {
.sendName(PROJECT_NAME)
.selectMultiConfigurationProjectAndSubmit()
.clickSave()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualProjectName, PROJECT_NAME);
}
Expand Down Expand Up @@ -62,8 +61,7 @@ public void testRenameViaSidebar() {
.clickSidebarRename()
.clearNameField()
.sendNewProjectName(RENAMED_PROJECT)
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualProjectName, RENAMED_PROJECT);
}
Expand All @@ -78,8 +76,7 @@ public void testRenameViaDashboardDropdownMenu() {
.clickRenameViaDashboardDropDownMenu()
.clearNameField()
.sendNewProjectName(RENAMED_PROJECT)
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(actualProjectName, RENAMED_PROJECT);
}
Expand All @@ -94,8 +91,7 @@ public void testValidQuietPeriodValues(String seconds) {
.clickQuietPeriodCheckbox()
.setQuietPeriodInput(seconds)
.clickSave()
.getHeader()
.getText();
.getHeaderText();

Assert.assertEquals(configPage, PROJECT_NAME);
}
Expand Down
Loading