From f456ef394f0e35af6031dd5af31b0cb5c8568de3 Mon Sep 17 00:00:00 2001 From: Stanislav Agafonov Date: Fri, 30 Jan 2026 18:33:58 +0300 Subject: [PATCH 01/14] API test > APIJenkinsTest > testCreateAndDeleteFolder --- .../java/school/redrover/APIJenkinsTest.java | 67 ++++++++++++++----- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/src/test/java/school/redrover/APIJenkinsTest.java b/src/test/java/school/redrover/APIJenkinsTest.java index 126c20355..58c7ece89 100644 --- a/src/test/java/school/redrover/APIJenkinsTest.java +++ b/src/test/java/school/redrover/APIJenkinsTest.java @@ -12,21 +12,6 @@ public class APIJenkinsTest extends APIBaseTest { - @Test - public void jenkinsTest() { - RestAssured.given() - .log().all()// ← добавил что бы смотреть, что отправляю и что получаю(в конце лог) - .when() - .auth() - .preemptive() - .basic(userName, apiToken) - .when() - .get(jenkinsUrl + "api/json") - .then() - .log().all() - .statusCode(200); - } - @Test public void testCreateFreestyleProjectWithValidName() { Map projectName = new HashMap<>(); @@ -79,4 +64,56 @@ public void testCreateFreestyleProjectWithValidName() { Assert.assertEquals(statusCode, 200); } + @Test + public void testCreateAndDeleteFolder() { + String folderName = "ApiTestFolder"; + + String folderConfigXml = """ + + Created via CloudBees Folder Plugin API + + """; + + RestAssured.given() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .contentType(ContentType.XML) + .queryParam("name", folderName) + .body(folderConfigXml) + .when() + .post("/createItem") + .then() + .statusCode(200); + + Response getResponse = RestAssured.given() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .get("job/%s/api/json".formatted(folderName)) + .then() + .extract().response(); + + Assert.assertEquals(getResponse.statusCode(), 200); + Assert.assertEquals(getResponse.jsonPath().getString("name"), folderName); + + RestAssured.given() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .post("job/%s/doDelete".formatted(folderName)) + .then() + .statusCode(302); + + Response deletedResponse = RestAssured.given() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .get("job/%s/api/json".formatted(folderName)) + .then() + .extract().response(); + + Assert.assertEquals(deletedResponse.statusCode(), 404, + "Expected 404 after deletion, but got " + deletedResponse.statusCode()); + } + } From f574e4f91d70198cd86fc249e3d635aba01247f7 Mon Sep 17 00:00:00 2001 From: Marin4kin Date: Fri, 30 Jan 2026 23:18:45 +0300 Subject: [PATCH 02/14] new testCreateUser --- .../java/school/redrover/APIJenkinsTest.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/test/java/school/redrover/APIJenkinsTest.java b/src/test/java/school/redrover/APIJenkinsTest.java index 16c984c2a..cd233265e 100644 --- a/src/test/java/school/redrover/APIJenkinsTest.java +++ b/src/test/java/school/redrover/APIJenkinsTest.java @@ -134,4 +134,44 @@ public void testCreatePiplineAndDisable() { Assert.assertEquals(getResponse.getStatusCode(), 200); Assert.assertTrue(responseBody.contains("This project is currently disabled")); } + + @Test + public void testCreateUser() { + Map userForm = new HashMap<>(); + userForm.put("username", "UserUser" ); + userForm.put("password1", "passwordUser"); + userForm.put("password2", "passwordUser"); + userForm.put("fullname", "UserUserName"); + userForm.put("email", "user@user.us"); + + Response response = RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .contentType(ContentType.XML) + .queryParams(userForm) + .when() + .post("securityRealm/createAccountByAdmin") + .then() + .log().all() + .extract().response(); + + String location = response.getHeader("Location"); + + Response getResponse = RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .get("%s".formatted(location)) + .then() + .log().all() + .extract().response(); + + String responseBody = getResponse.getBody().asString(); + + Assert.assertEquals(response.getStatusCode(), 302); + Assert.assertEquals(getResponse.getStatusCode(), 200); + Assert.assertTrue(responseBody.contains(userForm.get("username"))); + } } From b8f0c10d8a0e8fb7e7508a75ee92bebff0aaf936 Mon Sep 17 00:00:00 2001 From: Marin4kin Date: Fri, 30 Jan 2026 23:21:39 +0300 Subject: [PATCH 03/14] new testCreateUser --- src/test/java/school/redrover/APIJenkinsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/school/redrover/APIJenkinsTest.java b/src/test/java/school/redrover/APIJenkinsTest.java index cd233265e..6b6402526 100644 --- a/src/test/java/school/redrover/APIJenkinsTest.java +++ b/src/test/java/school/redrover/APIJenkinsTest.java @@ -138,7 +138,7 @@ public void testCreatePiplineAndDisable() { @Test public void testCreateUser() { Map userForm = new HashMap<>(); - userForm.put("username", "UserUser" ); + userForm.put("username", "UserUser"); userForm.put("password1", "passwordUser"); userForm.put("password2", "passwordUser"); userForm.put("fullname", "UserUserName"); From 0e238faba5707ac8ef74a5cd42d2189db55f618d Mon Sep 17 00:00:00 2001 From: Marin4kin Date: Fri, 30 Jan 2026 23:23:24 +0300 Subject: [PATCH 04/14] new testCreateUser --- .../java/school/redrover/APIJenkinsTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/java/school/redrover/APIJenkinsTest.java b/src/test/java/school/redrover/APIJenkinsTest.java index 6b6402526..20efd38e5 100644 --- a/src/test/java/school/redrover/APIJenkinsTest.java +++ b/src/test/java/school/redrover/APIJenkinsTest.java @@ -137,19 +137,19 @@ public void testCreatePiplineAndDisable() { @Test public void testCreateUser() { - Map userForm = new HashMap<>(); - userForm.put("username", "UserUser"); - userForm.put("password1", "passwordUser"); - userForm.put("password2", "passwordUser"); - userForm.put("fullname", "UserUserName"); - userForm.put("email", "user@user.us"); + Map userData = new HashMap<>(); + userData.put("username", "UserUser"); + userData.put("password1", "passwordUser"); + userData.put("password2", "passwordUser"); + userData.put("fullname", "UserUserName"); + userData.put("email", "user@user.us"); Response response = RestAssured.given() .log().all() .auth().preemptive().basic(userName, apiToken) .baseUri(jenkinsUrl) .contentType(ContentType.XML) - .queryParams(userForm) + .queryParams(userData) .when() .post("securityRealm/createAccountByAdmin") .then() @@ -172,6 +172,6 @@ public void testCreateUser() { Assert.assertEquals(response.getStatusCode(), 302); Assert.assertEquals(getResponse.getStatusCode(), 200); - Assert.assertTrue(responseBody.contains(userForm.get("username"))); + Assert.assertTrue(responseBody.contains(userData.get("username"))); } } From f0847b42d88410a00f8ba0a8c5f77098778d1f22 Mon Sep 17 00:00:00 2001 From: Marin4kin Date: Fri, 30 Jan 2026 23:40:29 +0300 Subject: [PATCH 05/14] new testCreateUser --- src/test/java/school/redrover/APIJenkinsTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/school/redrover/APIJenkinsTest.java b/src/test/java/school/redrover/APIJenkinsTest.java index 20efd38e5..fba8a6b4e 100644 --- a/src/test/java/school/redrover/APIJenkinsTest.java +++ b/src/test/java/school/redrover/APIJenkinsTest.java @@ -148,7 +148,6 @@ public void testCreateUser() { .log().all() .auth().preemptive().basic(userName, apiToken) .baseUri(jenkinsUrl) - .contentType(ContentType.XML) .queryParams(userData) .when() .post("securityRealm/createAccountByAdmin") From b1fd4446540c78b8c6411fea6ff9a78ae874d3e5 Mon Sep 17 00:00:00 2001 From: Alexey Kulagin Date: Fri, 30 Jan 2026 13:15:44 -0800 Subject: [PATCH 06/14] RF | Delete MoveTrait, make MovePage common https://github.com/RedRoverSchool/JenkinsQA_Java_2025_fall/issues/1909 (#1910) * RF | Delete MoveTrait, make MovePage common https://github.com/RedRoverSchool/JenkinsQA_Java_2025_fall/issues/1909 * Removed unused Move pages --- src/test/java/school/redrover/FolderTest.java | 4 +- .../sidebar/BaseSidebarComponent.java | 15 ++++++- .../sidebar/FreestyleProjectSidebar.java | 7 +-- .../sidebar/MultiBranchProjectSidebar.java | 9 +--- .../sidebar/MultiConfigProjectSidebar.java | 8 +--- .../sidebar/OrganizationFolderSidebar.java | 9 +--- .../sidebar/PipelineProjectSidebar.java | 9 +--- .../page/FreestyleProjectMovePage.java | 17 ------- .../java/school/redrover/page/HomePage.java | 4 +- .../java/school/redrover/page/MovePage.java | 40 ----------------- .../page/MultiBranchProjectMovePage.java | 17 ------- .../page/MultiConfigProjectMovePage.java | 17 ------- .../page/OrganizationFolderMovePage.java | 18 -------- .../page/PipelineProjectMovePage.java | 18 -------- .../school/redrover/page/ProjectMovePage.java | 45 +++++++++++++++++++ .../project_sidebar/SidebarMoveTrait.java | 18 -------- 16 files changed, 67 insertions(+), 188 deletions(-) delete mode 100644 src/test/java/school/redrover/page/FreestyleProjectMovePage.java delete mode 100644 src/test/java/school/redrover/page/MovePage.java delete mode 100644 src/test/java/school/redrover/page/MultiBranchProjectMovePage.java delete mode 100644 src/test/java/school/redrover/page/MultiConfigProjectMovePage.java delete mode 100644 src/test/java/school/redrover/page/OrganizationFolderMovePage.java delete mode 100644 src/test/java/school/redrover/page/PipelineProjectMovePage.java create mode 100644 src/test/java/school/redrover/page/ProjectMovePage.java delete mode 100644 src/test/java/school/redrover/trait/project_sidebar/SidebarMoveTrait.java diff --git a/src/test/java/school/redrover/FolderTest.java b/src/test/java/school/redrover/FolderTest.java index 7637ca616..f3149b018 100644 --- a/src/test/java/school/redrover/FolderTest.java +++ b/src/test/java/school/redrover/FolderTest.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.FolderStatusPage; @@ -197,7 +196,8 @@ public void testPutItemsToFolder() { .openDropdownMenu(itemName) .clickMoveInDropdownMenu() .selectDestinationFolder(FOLDER_NAME) - .clickMoveButtonAndGoHome(); + .clickMoveButton() + .gotoHomePage(); } List folderItemList = new HomePage(getDriver()) diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/BaseSidebarComponent.java b/src/test/java/school/redrover/component/project/status_page/sidebar/BaseSidebarComponent.java index 5bdcb3df5..cf6bb4df6 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/BaseSidebarComponent.java +++ b/src/test/java/school/redrover/component/project/status_page/sidebar/BaseSidebarComponent.java @@ -6,6 +6,7 @@ import school.redrover.component.BaseComponent; import school.redrover.page.BaseProjectConfigurationPage; import school.redrover.page.BaseProjectStatusPage; +import school.redrover.page.ProjectMovePage; import school.redrover.page.ProjectRenamingPage; import java.util.function.Function; @@ -23,11 +24,15 @@ public abstract class BaseSidebarComponent< @FindBy(xpath = "//a[contains(@href, '/configure')]") private WebElement configureMenuItem; + @FindBy(xpath = "//a[contains(., 'Delete')]") + private WebElement deleteMenuItem; + + @FindBy(xpath = "//a[contains(., 'Move')]") + private WebElement moveMenuItem; + @FindBy(xpath = "//a[contains(., 'Rename')]") private WebElement renameMenuItem; - @FindBy(xpath = "//a[contains(., 'Delete')]") - private WebElement deleteMenuItem; private final Function projectStatusPageFactory; @@ -58,6 +63,12 @@ public ProjectStatusPage clickSidebarDelete() { return getProjectStatusPage().waitUntilPageLoadJS(); } + public ProjectMovePage clickSidebarMove() { + moveMenuItem.click(); + + return new ProjectMovePage<>(getDriver(), projectStatusPageFactory).waitUntilPageLoadJS(); + } + public ProjectRenamingPage clickSidebarRename() { renameMenuItem.click(); diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/FreestyleProjectSidebar.java b/src/test/java/school/redrover/component/project/status_page/sidebar/FreestyleProjectSidebar.java index 4ad6dbcc7..20649d091 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/FreestyleProjectSidebar.java +++ b/src/test/java/school/redrover/component/project/status_page/sidebar/FreestyleProjectSidebar.java @@ -8,7 +8,7 @@ public class FreestyleProjectSidebar extends BaseSidebarComponent< FreestyleProjectSidebar, FreestyleProjectStatusPage, FreestyleProjectConfigurationPage> implements SidebarChangesTrait, SidebarWorkspaceTrait, - SidebarBuildNowTrait, SidebarMoveTrait, SidebarCredentialsTrait { + SidebarBuildNowTrait, SidebarCredentialsTrait { public FreestyleProjectSidebar(WebDriver driver) { super(driver, FreestyleProjectStatusPage::new); @@ -39,11 +39,6 @@ public FreestyleProjectCredentialsPage getProjectCredentialsPage() { return new FreestyleProjectCredentialsPage(getDriver()); } - @Override - public FreestyleProjectMovePage getProjectMovePage() { - return new FreestyleProjectMovePage(getDriver()); - } - @Override public FreestyleProjectWorkspacePage getProjectWorkspacePage() { return new FreestyleProjectWorkspacePage(getDriver()); diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiBranchProjectSidebar.java b/src/test/java/school/redrover/component/project/status_page/sidebar/MultiBranchProjectSidebar.java index eaaa1388c..d6105e25b 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiBranchProjectSidebar.java +++ b/src/test/java/school/redrover/component/project/status_page/sidebar/MultiBranchProjectSidebar.java @@ -4,13 +4,11 @@ import school.redrover.page.*; import school.redrover.trait.project_sidebar.SidebarBuildHistoryTrait; import school.redrover.trait.project_sidebar.SidebarCredentialsTrait; -import school.redrover.trait.project_sidebar.SidebarMoveTrait; public class MultiBranchProjectSidebar extends BaseSidebarComponent< MultiBranchProjectSidebar, MultibranchProjectStatusPage, MultibranchProjectConfigurationPage> - implements SidebarBuildHistoryTrait, SidebarMoveTrait, - SidebarCredentialsTrait { + implements SidebarBuildHistoryTrait, SidebarCredentialsTrait { public MultiBranchProjectSidebar(WebDriver driver) { super(driver, MultibranchProjectStatusPage::new); @@ -40,9 +38,4 @@ public MultiBranchProjectBuildHistoryPage getProjectBuildHistoryPage() { public MultiBranchProjectCredentialsPage getProjectCredentialsPage() { return new MultiBranchProjectCredentialsPage(getDriver()); } - - @Override - public MultiBranchProjectMovePage getProjectMovePage() { - return new MultiBranchProjectMovePage(getDriver()); - } } diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiConfigProjectSidebar.java b/src/test/java/school/redrover/component/project/status_page/sidebar/MultiConfigProjectSidebar.java index f3995aee6..5112b8f39 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiConfigProjectSidebar.java +++ b/src/test/java/school/redrover/component/project/status_page/sidebar/MultiConfigProjectSidebar.java @@ -8,8 +8,7 @@ public class MultiConfigProjectSidebar extends BaseSidebarComponent implements SidebarChangesTrait, SidebarWorkspaceTrait, - SidebarBuildNowTrait, SidebarMoveTrait, - SidebarCredentialsTrait { + SidebarBuildNowTrait, SidebarCredentialsTrait { public MultiConfigProjectSidebar(WebDriver driver) { super(driver, MultiConfigProjectStatusPage::new); @@ -40,11 +39,6 @@ public MultiConfigProjectCredentialsPage getProjectCredentialsPage() { return new MultiConfigProjectCredentialsPage(getDriver()); } - @Override - public MultiConfigProjectMovePage getProjectMovePage() { - return new MultiConfigProjectMovePage(getDriver()); - } - @Override public MultiConfigProjectWorkspacePage getProjectWorkspacePage() { return new MultiConfigProjectWorkspacePage(getDriver()); diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/OrganizationFolderSidebar.java b/src/test/java/school/redrover/component/project/status_page/sidebar/OrganizationFolderSidebar.java index 3d6f4c333..b70d9fcd3 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/OrganizationFolderSidebar.java +++ b/src/test/java/school/redrover/component/project/status_page/sidebar/OrganizationFolderSidebar.java @@ -4,13 +4,11 @@ import school.redrover.page.*; import school.redrover.trait.project_sidebar.SidebarBuildHistoryTrait; import school.redrover.trait.project_sidebar.SidebarCredentialsTrait; -import school.redrover.trait.project_sidebar.SidebarMoveTrait; public class OrganizationFolderSidebar extends BaseSidebarComponent - implements SidebarBuildHistoryTrait, SidebarMoveTrait, - SidebarCredentialsTrait { + implements SidebarBuildHistoryTrait, SidebarCredentialsTrait { public OrganizationFolderSidebar(WebDriver driver) { super(driver, OrganizationFolderStatusPage::new); @@ -40,9 +38,4 @@ public OrganizationFolderBuildHistoryPage getProjectBuildHistoryPage() { public OrganizationFolderCredentialsPage getProjectCredentialsPage() { return null; } - - @Override - public OrganizationFolderMovePage getProjectMovePage() { - return null; - } } diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/PipelineProjectSidebar.java b/src/test/java/school/redrover/component/project/status_page/sidebar/PipelineProjectSidebar.java index 5f11a59e5..4ebe81fa6 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/PipelineProjectSidebar.java +++ b/src/test/java/school/redrover/component/project/status_page/sidebar/PipelineProjectSidebar.java @@ -5,13 +5,11 @@ import school.redrover.trait.project_sidebar.SidebarBuildNowTrait; import school.redrover.trait.project_sidebar.SidebarChangesTrait; import school.redrover.trait.project_sidebar.SidebarCredentialsTrait; -import school.redrover.trait.project_sidebar.SidebarMoveTrait; public class PipelineProjectSidebar extends BaseSidebarComponent - implements SidebarChangesTrait, SidebarBuildNowTrait, - SidebarMoveTrait, SidebarCredentialsTrait { + implements SidebarChangesTrait, SidebarBuildNowTrait, SidebarCredentialsTrait { public PipelineProjectSidebar(WebDriver driver) { super(driver, PipelineProjectStatusPage::new); @@ -41,9 +39,4 @@ public PipelineProjectChangesPage getProjectChangesPage() { public PipelineProjectCredentialsPage getProjectCredentialsPage() { return new PipelineProjectCredentialsPage(getDriver()); } - - @Override - public PipelineProjectMovePage getProjectMovePage() { - return new PipelineProjectMovePage(getDriver()); - } } diff --git a/src/test/java/school/redrover/page/FreestyleProjectMovePage.java b/src/test/java/school/redrover/page/FreestyleProjectMovePage.java deleted file mode 100644 index 0b6398309..000000000 --- a/src/test/java/school/redrover/page/FreestyleProjectMovePage.java +++ /dev/null @@ -1,17 +0,0 @@ -package school.redrover.page; - -import org.openqa.selenium.WebDriver; -import school.redrover.common.BasePage; - - -public class FreestyleProjectMovePage extends BasePage { - - public FreestyleProjectMovePage(WebDriver driver) { - super(driver); - } - - @Override - public FreestyleProjectMovePage getPage() { - return this; - } - } diff --git a/src/test/java/school/redrover/page/HomePage.java b/src/test/java/school/redrover/page/HomePage.java index 64101a7a4..bbccc32b0 100644 --- a/src/test/java/school/redrover/page/HomePage.java +++ b/src/test/java/school/redrover/page/HomePage.java @@ -174,9 +174,9 @@ public HomePage openDropdownMenu(String itemName) { return this; } - public MovePage clickMoveInDropdownMenu() { + public ProjectMovePage clickMoveInDropdownMenu() { getWait2().until(ExpectedConditions.elementToBeClickable(moveDropDownMenuItem)).click(); - return new MovePage(getDriver()).waitUntilPageLoadJS(); + return new ProjectMovePage<>(getDriver(), FolderStatusPage::new).waitUntilPageLoadJS(); } public PipelineProjectSyntaxPage clickPipelineSyntaxInDropdownMenu() { diff --git a/src/test/java/school/redrover/page/MovePage.java b/src/test/java/school/redrover/page/MovePage.java deleted file mode 100644 index 9c646ea17..000000000 --- a/src/test/java/school/redrover/page/MovePage.java +++ /dev/null @@ -1,40 +0,0 @@ -package school.redrover.page; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.ui.ExpectedConditions; -import org.openqa.selenium.support.ui.Select; -import school.redrover.common.BasePage; - - -public class MovePage extends BasePage { - - @FindBy(className = "jenkins-select__input") - private WebElement selectFolder; - - @FindBy(name = "Submit") - private WebElement moveButton; - - public MovePage(WebDriver driver) { - super(driver); - } - - @Override - public MovePage getPage() { - return this; - } - - public MovePage selectDestinationFolder(String folderName) { - new Select(selectFolder).selectByVisibleText("Jenkins » %s".formatted(folderName)); - - return this; - } - - public void clickMoveButtonAndGoHome() { - String urlBeforeMoving = getDriver().getCurrentUrl(); - moveButton.click(); - getWait5().until(ExpectedConditions.not(ExpectedConditions.urlToBe(urlBeforeMoving))); - gotoHomePage(); - } -} diff --git a/src/test/java/school/redrover/page/MultiBranchProjectMovePage.java b/src/test/java/school/redrover/page/MultiBranchProjectMovePage.java deleted file mode 100644 index b08a112cd..000000000 --- a/src/test/java/school/redrover/page/MultiBranchProjectMovePage.java +++ /dev/null @@ -1,17 +0,0 @@ -package school.redrover.page; - -import org.openqa.selenium.WebDriver; -import school.redrover.common.BasePage; - - -public class MultiBranchProjectMovePage extends BasePage { - - public MultiBranchProjectMovePage(WebDriver driver) { - super(driver); - } - - @Override - public MultiBranchProjectMovePage getPage() { - return this; - } -} diff --git a/src/test/java/school/redrover/page/MultiConfigProjectMovePage.java b/src/test/java/school/redrover/page/MultiConfigProjectMovePage.java deleted file mode 100644 index 2a46a9a29..000000000 --- a/src/test/java/school/redrover/page/MultiConfigProjectMovePage.java +++ /dev/null @@ -1,17 +0,0 @@ -package school.redrover.page; - -import org.openqa.selenium.WebDriver; -import school.redrover.common.BasePage; - - -public class MultiConfigProjectMovePage extends BasePage { - - public MultiConfigProjectMovePage(WebDriver driver) { - super(driver); - } - - @Override - public MultiConfigProjectMovePage getPage() { - return this; - } -} diff --git a/src/test/java/school/redrover/page/OrganizationFolderMovePage.java b/src/test/java/school/redrover/page/OrganizationFolderMovePage.java deleted file mode 100644 index 808892d01..000000000 --- a/src/test/java/school/redrover/page/OrganizationFolderMovePage.java +++ /dev/null @@ -1,18 +0,0 @@ -package school.redrover.page; - -import org.openqa.selenium.WebDriver; -import school.redrover.common.BasePage; - - -public class OrganizationFolderMovePage extends BasePage { - - public OrganizationFolderMovePage(WebDriver driver) { - super(driver); - } - - @Override - public OrganizationFolderMovePage getPage() { - return this; - } - -} diff --git a/src/test/java/school/redrover/page/PipelineProjectMovePage.java b/src/test/java/school/redrover/page/PipelineProjectMovePage.java deleted file mode 100644 index c3076525e..000000000 --- a/src/test/java/school/redrover/page/PipelineProjectMovePage.java +++ /dev/null @@ -1,18 +0,0 @@ -package school.redrover.page; - -import org.openqa.selenium.WebDriver; -import school.redrover.common.BasePage; - - -public class PipelineProjectMovePage extends BasePage { - - public PipelineProjectMovePage(WebDriver driver) { - super(driver); - } - - @Override - public PipelineProjectMovePage getPage() { - return this; - } - -} diff --git a/src/test/java/school/redrover/page/ProjectMovePage.java b/src/test/java/school/redrover/page/ProjectMovePage.java new file mode 100644 index 000000000..87c772293 --- /dev/null +++ b/src/test/java/school/redrover/page/ProjectMovePage.java @@ -0,0 +1,45 @@ +package school.redrover.page; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.ui.Select; +import school.redrover.common.BasePage; + +import java.util.function.Function; + + +public class ProjectMovePage> + extends BasePage> { + + @FindBy(className = "jenkins-select__input") + private WebElement selectFolder; + + @FindBy(name = "Submit") + private WebElement moveButton; + + private final Function projectStatusPageFactory; + + + public ProjectMovePage(WebDriver driver, Function projectStatusPageFactory) { + super(driver); + this.projectStatusPageFactory = projectStatusPageFactory; + } + + @Override + public ProjectMovePage getPage() { + return this; + } + + public ProjectMovePage selectDestinationFolder(String folderName) { + new Select(selectFolder).selectByVisibleText("Jenkins » %s".formatted(folderName)); + + return this; + } + + public ProjectStatusPage clickMoveButton() { + moveButton.click(); + + return projectStatusPageFactory.apply(getDriver()).waitUntilPageLoadJS(); + } +} diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarMoveTrait.java b/src/test/java/school/redrover/trait/project_sidebar/SidebarMoveTrait.java deleted file mode 100644 index 7a2d40e75..000000000 --- a/src/test/java/school/redrover/trait/project_sidebar/SidebarMoveTrait.java +++ /dev/null @@ -1,18 +0,0 @@ -package school.redrover.trait.project_sidebar; - -import org.openqa.selenium.By; - -import school.redrover.common.BasePage; -import school.redrover.trait.BaseTrait; - - -public interface SidebarMoveTrait> extends BaseTrait { - - ProjectMovePage getProjectMovePage(); - - default ProjectMovePage clickSidebarMove() { - getDriver().findElement(By.xpath("//a[contains(., 'Move')]")).click(); - - return getProjectMovePage().waitUntilPageLoadJS(); - } -} From 800b1e6775184229dc07ebebae569ba9a6c4a07a Mon Sep 17 00:00:00 2001 From: YevgenyN <163114876+tstyev@users.noreply.github.com> Date: Sat, 31 Jan 2026 01:24:43 +0300 Subject: [PATCH 07/14] API | Rename Freestyle Project (#1922) * API | Rename Freestyle Project #1921 --- .../APIFreestyleProjectTest.java} | 76 ++++++----------- .../school/redrover/api/APIJenkinsTest.java | 84 +++++++++++++++++++ .../school/redrover/{ => api}/APITest.java | 3 +- .../java/school/redrover/common/BasePage.java | 17 ++-- .../school/redrover/common/CucumberTest.java | 2 +- .../common/filter/FilterForTestsTest.java | 10 +-- .../{ => ui}/BreadcrumbsDropDownTest.java | 6 +- .../{ => ui}/BuildHistoryAccessTest.java | 6 +- .../{ => ui}/ConfigurationMatrixTest.java | 6 +- .../{ => ui}/ConfigureAppearanceTest.java | 4 +- .../{ => ui}/ConfigureSystemTest.java | 4 +- .../redrover/{ => ui}/CopyFieldTest.java | 4 +- .../redrover/{ => ui}/CreateNewItemTest.java | 8 +- .../redrover/{ => ui}/CredentialsTest.java | 4 +- .../redrover/{ => ui}/DashboardTest.java | 4 +- .../redrover/{ => ui}/DescriptionTest.java | 4 +- .../{ => ui}/FolderConfigurationTest.java | 4 +- .../{ => ui}/FolderManagementTest.java | 4 +- .../redrover/{ => ui}/FolderSettingsTest.java | 6 +- .../school/redrover/{ => ui}/FolderTest.java | 6 +- .../school/redrover/{ => ui}/FooterTest.java | 4 +- .../{ => ui}/FreestyleProjectTest.java | 8 +- .../school/redrover/{ => ui}/HeaderTest.java | 6 +- .../{ => ui}/JenkinsManagementTest.java | 4 +- .../MultiConfigurationProjectTest.java | 4 +- .../{ => ui}/MultibranchPipelineTest.java | 6 +- .../{ => ui}/NavigateToDashboardTest.java | 4 +- .../school/redrover/{ => ui}/NodeTest.java | 4 +- .../OrganizationFolderConfigurationTest.java | 6 +- .../{ => ui}/OrganizationFolderTest.java | 6 +- .../{ => ui}/PipelineBuildTriggersTest.java | 4 +- .../{ => ui}/PipelineConfigurationTest.java | 8 +- .../redrover/{ => ui}/PipelineTest.java | 8 +- .../redrover/{ => ui}/SignInOutTest.java | 6 +- .../redrover/{ => ui}/StatusAdminTest.java | 4 +- .../redrover/{ => ui}/UserLoggedInTest.java | 4 +- .../school/redrover/{ => ui}/UserTest.java | 4 +- .../{ => ui}/component/BaseComponent.java | 2 +- .../common/JenkinsVersionFooterDropdown.java | 4 +- .../component/common/SearchComponent.java | 10 +-- .../common/UserAccountIconDropdown.java | 8 +- .../sidebar/BaseSidebarComponent.java | 12 +-- .../status_page/sidebar/FolderSidebar.java | 8 +- .../sidebar/FreestyleProjectSidebar.java | 6 +- .../sidebar/MultiBranchProjectSidebar.java | 11 ++- .../sidebar/MultiConfigProjectSidebar.java | 6 +- .../sidebar/OrganizationFolderSidebar.java | 11 ++- .../sidebar/PipelineProjectSidebar.java | 18 ++-- .../{ => ui}/cucumber/FreestyleSteps.java | 10 +-- .../redrover/{ => ui}/cucumber/ViewSteps.java | 4 +- .../{ => ui}/page/AppearancePage.java | 2 +- .../page/ArchitectingForScalePage.java | 2 +- .../page/BaseProjectConfigurationPage.java | 3 +- .../{ => ui}/page/BaseProjectStatusPage.java | 4 +- .../page/BuildHistoryOfJenkinsPage.java | 3 +- .../redrover/{ => ui}/page/CloudsPage.java | 3 +- .../{ => ui}/page/CreateViewPage.java | 2 +- .../redrover/{ => ui}/page/EditViewPage.java | 2 +- .../redrover/{ => ui}/page/ErrorPage.java | 2 +- .../{ => ui}/page/FolderBuildHistoryPage.java | 2 +- .../page/FolderConfigurationPage.java | 2 +- .../{ => ui}/page/FolderCreateViewPage.java | 2 +- .../{ => ui}/page/FolderCredentialsPage.java | 3 +- .../{ => ui}/page/FolderStatusPage.java | 4 +- .../{ => ui}/page/FolderViewPage.java | 2 +- .../page/FreestyleProjectChangesPage.java | 2 +- .../FreestyleProjectConfigurationPage.java | 2 +- .../page/FreestyleProjectCredentialsPage.java | 2 +- .../page/FreestyleProjectStatusPage.java | 5 +- .../page/FreestyleProjectWorkspacePage.java | 3 +- .../{ => ui}/page/GlobalCredentialsPage.java | 3 +- .../redrover/{ => ui}/page/HomePage.java | 2 +- .../{ => ui}/page/JenkinsManagementPage.java | 3 +- .../redrover/{ => ui}/page/LoginPage.java | 3 +- .../MultiBranchProjectBuildHistoryPage.java | 2 +- .../MultiBranchProjectCredentialsPage.java | 2 +- .../page/MultiConfigProjectBuildNowPage.java | 2 +- .../page/MultiConfigProjectChangesPage.java | 2 +- .../MultiConfigProjectConfigurationPage.java | 2 +- .../MultiConfigProjectCredentialsPage.java | 2 +- .../page/MultiConfigProjectStatusPage.java | 4 +- .../page/MultiConfigProjectWorkspacePage.java | 2 +- .../MultibranchProjectConfigurationPage.java | 2 +- .../page/MultibranchProjectStatusPage.java | 4 +- .../{ => ui}/page/NewCredentialsPage.java | 2 +- .../redrover/{ => ui}/page/NewItemPage.java | 2 +- .../redrover/{ => ui}/page/NewNodePage.java | 2 +- .../redrover/{ => ui}/page/NodesPage.java | 2 +- .../OrganizationFolderBuildHistoryPage.java | 2 +- .../OrganizationFolderConfigurationPage.java | 2 +- .../OrganizationFolderCredentialsPage.java | 2 +- .../page/OrganizationFolderStatusPage.java | 4 +- .../page/PipelineProjectBuildNowPage.java | 2 +- .../page/PipelineProjectChangesPage.java | 2 +- .../PipelineProjectConfigurationPage.java | 2 +- .../page/PipelineProjectCredentialsPage.java | 2 +- .../PipelineProjectHistoryConsolePage.java | 2 +- .../page/PipelineProjectHistoryPage.java | 2 +- .../page/PipelineProjectStatusPage.java | 4 +- .../page/PipelineProjectSyntaxPage.java | 2 +- .../{ => ui}/page/ProjectMovePage.java | 2 +- .../{ => ui}/page/ProjectRenamingPage.java | 2 +- .../redrover/{ => ui}/page/RestApiPage.java | 2 +- .../page/SystemConfigurationPage.java | 2 +- .../{ => ui}/page/UserAccountPage.java | 3 +- .../{ => ui}/page/UserCreatingPage.java | 3 +- .../{ => ui}/page/UserStatusPage.java | 2 +- .../redrover/{ => ui}/page/UsersPage.java | 2 +- .../redrover/{ => ui}/trait/BaseTrait.java | 2 +- .../SidebarBuildHistoryTrait.java | 4 +- .../project_sidebar/SidebarBuildNowTrait.java | 4 +- .../project_sidebar/SidebarChangesTrait.java | 4 +- .../SidebarCredentialsTrait.java | 4 +- .../SidebarWorkspaceTrait.java | 4 +- 114 files changed, 344 insertions(+), 281 deletions(-) rename src/test/java/school/redrover/{APIJenkinsTest.java => api/APIFreestyleProjectTest.java} (61%) create mode 100644 src/test/java/school/redrover/api/APIJenkinsTest.java rename src/test/java/school/redrover/{ => api}/APITest.java (98%) rename src/test/java/school/redrover/{ => ui}/BreadcrumbsDropDownTest.java (92%) rename src/test/java/school/redrover/{ => ui}/BuildHistoryAccessTest.java (92%) rename src/test/java/school/redrover/{ => ui}/ConfigurationMatrixTest.java (93%) rename src/test/java/school/redrover/{ => ui}/ConfigureAppearanceTest.java (95%) rename src/test/java/school/redrover/{ => ui}/ConfigureSystemTest.java (99%) rename src/test/java/school/redrover/{ => ui}/CopyFieldTest.java (94%) rename src/test/java/school/redrover/{ => ui}/CreateNewItemTest.java (97%) rename src/test/java/school/redrover/{ => ui}/CredentialsTest.java (96%) rename src/test/java/school/redrover/{ => ui}/DashboardTest.java (99%) rename src/test/java/school/redrover/{ => ui}/DescriptionTest.java (94%) rename src/test/java/school/redrover/{ => ui}/FolderConfigurationTest.java (99%) rename src/test/java/school/redrover/{ => ui}/FolderManagementTest.java (98%) rename src/test/java/school/redrover/{ => ui}/FolderSettingsTest.java (92%) rename src/test/java/school/redrover/{ => ui}/FolderTest.java (98%) rename src/test/java/school/redrover/{ => ui}/FooterTest.java (98%) rename src/test/java/school/redrover/{ => ui}/FreestyleProjectTest.java (98%) rename src/test/java/school/redrover/{ => ui}/HeaderTest.java (91%) rename src/test/java/school/redrover/{ => ui}/JenkinsManagementTest.java (98%) rename src/test/java/school/redrover/{ => ui}/MultiConfigurationProjectTest.java (98%) rename src/test/java/school/redrover/{ => ui}/MultibranchPipelineTest.java (98%) rename src/test/java/school/redrover/{ => ui}/NavigateToDashboardTest.java (96%) rename src/test/java/school/redrover/{ => ui}/NodeTest.java (97%) rename src/test/java/school/redrover/{ => ui}/OrganizationFolderConfigurationTest.java (94%) rename src/test/java/school/redrover/{ => ui}/OrganizationFolderTest.java (94%) rename src/test/java/school/redrover/{ => ui}/PipelineBuildTriggersTest.java (91%) rename src/test/java/school/redrover/{ => ui}/PipelineConfigurationTest.java (97%) rename src/test/java/school/redrover/{ => ui}/PipelineTest.java (98%) rename src/test/java/school/redrover/{ => ui}/SignInOutTest.java (90%) rename src/test/java/school/redrover/{ => ui}/StatusAdminTest.java (93%) rename src/test/java/school/redrover/{ => ui}/UserLoggedInTest.java (96%) rename src/test/java/school/redrover/{ => ui}/UserTest.java (98%) rename src/test/java/school/redrover/{ => ui}/component/BaseComponent.java (91%) rename src/test/java/school/redrover/{ => ui}/component/common/JenkinsVersionFooterDropdown.java (90%) rename src/test/java/school/redrover/{ => ui}/component/common/SearchComponent.java (92%) rename src/test/java/school/redrover/{ => ui}/component/common/UserAccountIconDropdown.java (88%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/BaseSidebarComponent.java (87%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/FolderSidebar.java (86%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/FreestyleProjectSidebar.java (90%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/MultiBranchProjectSidebar.java (72%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/MultiConfigProjectSidebar.java (90%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/OrganizationFolderSidebar.java (69%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/PipelineProjectSidebar.java (63%) rename src/test/java/school/redrover/{ => ui}/cucumber/FreestyleSteps.java (93%) rename src/test/java/school/redrover/{ => ui}/cucumber/ViewSteps.java (98%) rename src/test/java/school/redrover/{ => ui}/page/AppearancePage.java (98%) rename src/test/java/school/redrover/{ => ui}/page/ArchitectingForScalePage.java (90%) rename src/test/java/school/redrover/{ => ui}/page/BaseProjectConfigurationPage.java (97%) rename src/test/java/school/redrover/{ => ui}/page/BaseProjectStatusPage.java (79%) rename src/test/java/school/redrover/{ => ui}/page/BuildHistoryOfJenkinsPage.java (94%) rename src/test/java/school/redrover/{ => ui}/page/CloudsPage.java (86%) rename src/test/java/school/redrover/{ => ui}/page/CreateViewPage.java (97%) rename src/test/java/school/redrover/{ => ui}/page/EditViewPage.java (98%) rename src/test/java/school/redrover/{ => ui}/page/ErrorPage.java (94%) rename src/test/java/school/redrover/{ => ui}/page/FolderBuildHistoryPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/FolderConfigurationPage.java (99%) rename src/test/java/school/redrover/{ => ui}/page/FolderCreateViewPage.java (97%) rename src/test/java/school/redrover/{ => ui}/page/FolderCredentialsPage.java (92%) rename src/test/java/school/redrover/{ => ui}/page/FolderStatusPage.java (98%) rename src/test/java/school/redrover/{ => ui}/page/FolderViewPage.java (90%) rename src/test/java/school/redrover/{ => ui}/page/FreestyleProjectChangesPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/FreestyleProjectConfigurationPage.java (99%) rename src/test/java/school/redrover/{ => ui}/page/FreestyleProjectCredentialsPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/FreestyleProjectStatusPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/FreestyleProjectWorkspacePage.java (86%) rename src/test/java/school/redrover/{ => ui}/page/GlobalCredentialsPage.java (94%) rename src/test/java/school/redrover/{ => ui}/page/HomePage.java (99%) rename src/test/java/school/redrover/{ => ui}/page/JenkinsManagementPage.java (98%) rename src/test/java/school/redrover/{ => ui}/page/LoginPage.java (92%) rename src/test/java/school/redrover/{ => ui}/page/MultiBranchProjectBuildHistoryPage.java (92%) rename src/test/java/school/redrover/{ => ui}/page/MultiBranchProjectCredentialsPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/MultiConfigProjectBuildNowPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/MultiConfigProjectChangesPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/MultiConfigProjectConfigurationPage.java (98%) rename src/test/java/school/redrover/{ => ui}/page/MultiConfigProjectCredentialsPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/MultiConfigProjectStatusPage.java (94%) rename src/test/java/school/redrover/{ => ui}/page/MultiConfigProjectWorkspacePage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/MultibranchProjectConfigurationPage.java (98%) rename src/test/java/school/redrover/{ => ui}/page/MultibranchProjectStatusPage.java (94%) rename src/test/java/school/redrover/{ => ui}/page/NewCredentialsPage.java (97%) rename src/test/java/school/redrover/{ => ui}/page/NewItemPage.java (99%) rename src/test/java/school/redrover/{ => ui}/page/NewNodePage.java (97%) rename src/test/java/school/redrover/{ => ui}/page/NodesPage.java (99%) rename src/test/java/school/redrover/{ => ui}/page/OrganizationFolderBuildHistoryPage.java (92%) rename src/test/java/school/redrover/{ => ui}/page/OrganizationFolderConfigurationPage.java (98%) rename src/test/java/school/redrover/{ => ui}/page/OrganizationFolderCredentialsPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/OrganizationFolderStatusPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/PipelineProjectBuildNowPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/PipelineProjectChangesPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/PipelineProjectConfigurationPage.java (99%) rename src/test/java/school/redrover/{ => ui}/page/PipelineProjectCredentialsPage.java (91%) rename src/test/java/school/redrover/{ => ui}/page/PipelineProjectHistoryConsolePage.java (94%) rename src/test/java/school/redrover/{ => ui}/page/PipelineProjectHistoryPage.java (95%) rename src/test/java/school/redrover/{ => ui}/page/PipelineProjectStatusPage.java (96%) rename src/test/java/school/redrover/{ => ui}/page/PipelineProjectSyntaxPage.java (95%) rename src/test/java/school/redrover/{ => ui}/page/ProjectMovePage.java (97%) rename src/test/java/school/redrover/{ => ui}/page/ProjectRenamingPage.java (97%) rename src/test/java/school/redrover/{ => ui}/page/RestApiPage.java (95%) rename src/test/java/school/redrover/{ => ui}/page/SystemConfigurationPage.java (99%) rename src/test/java/school/redrover/{ => ui}/page/UserAccountPage.java (94%) rename src/test/java/school/redrover/{ => ui}/page/UserCreatingPage.java (95%) rename src/test/java/school/redrover/{ => ui}/page/UserStatusPage.java (98%) rename src/test/java/school/redrover/{ => ui}/page/UsersPage.java (98%) rename src/test/java/school/redrover/{ => ui}/trait/BaseTrait.java (87%) rename src/test/java/school/redrover/{ => ui}/trait/project_sidebar/SidebarBuildHistoryTrait.java (84%) rename src/test/java/school/redrover/{ => ui}/trait/project_sidebar/SidebarBuildNowTrait.java (82%) rename src/test/java/school/redrover/{ => ui}/trait/project_sidebar/SidebarChangesTrait.java (82%) rename src/test/java/school/redrover/{ => ui}/trait/project_sidebar/SidebarCredentialsTrait.java (83%) rename src/test/java/school/redrover/{ => ui}/trait/project_sidebar/SidebarWorkspaceTrait.java (83%) diff --git a/src/test/java/school/redrover/APIJenkinsTest.java b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java similarity index 61% rename from src/test/java/school/redrover/APIJenkinsTest.java rename to src/test/java/school/redrover/api/APIFreestyleProjectTest.java index 16c984c2a..43f42b7f3 100644 --- a/src/test/java/school/redrover/APIJenkinsTest.java +++ b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java @@ -1,9 +1,8 @@ -package school.redrover; +package school.redrover.api; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.response.Response; -import io.restassured.response.ResponseBody; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.APIBaseTest; @@ -11,29 +10,12 @@ import java.util.HashMap; import java.util.Map; -public class APIJenkinsTest extends APIBaseTest { +public class APIFreestyleProjectTest extends APIBaseTest { - @Test - public void jenkinsTest() { - RestAssured.given() - .log().all()// ← добавил что бы смотреть, что отправляю и что получаю(в конце лог) - .when() - .auth() - .preemptive() - .basic(userName, apiToken) - .when() - .get(jenkinsUrl + "api/json") - .then() - .log().all() - .statusCode(200); - } - - @Test - public void testCreateFreestyleProjectWithValidName() { - Map projectName = new HashMap<>(); - projectName.put("name", "FreestyleProjectName"); + private static final String PROJECT_NAME = "FreestyleProject"; + private static final String NEW_PROJECT_NAME = "NewFreestyleProject"; - String bodyFreestyleProjectXML = """ + private static final String bodyXML = """ false @@ -48,7 +30,12 @@ public void testCreateFreestyleProjectWithValidName() { - """; + """; + + @Test + public void testCreateWithValidName() { + Map projectName = new HashMap<>(); + projectName.put("name", PROJECT_NAME); RestAssured.given() .log().all() @@ -56,7 +43,7 @@ public void testCreateFreestyleProjectWithValidName() { .baseUri(jenkinsUrl) .contentType(ContentType.XML) .queryParams(projectName) - .body(bodyFreestyleProjectXML) + .body(bodyXML) .when() .post("/createItem") .then() @@ -81,57 +68,48 @@ public void testCreateFreestyleProjectWithValidName() { } @Test - public void testCreatePiplineAndDisable() { + public void testRenameProject() { Map projectName = new HashMap<>(); - projectName.put("name", "Pipline"); - - String bodyPiplineXML = """ - - false - - - false - - """; + projectName.put("name", PROJECT_NAME); RestAssured.given() + .log().all() .auth().preemptive().basic(userName, apiToken) .baseUri(jenkinsUrl) .contentType(ContentType.XML) .queryParams(projectName) - .body(bodyPiplineXML) + .body(bodyXML) .when() .post("/createItem") .then() .log().all() .statusCode(200); - Response response = RestAssured.given() + RestAssured.given() .log().all() .auth().preemptive().basic(userName, apiToken) .baseUri(jenkinsUrl) + .contentType("application/x-www-form-urlencoded") + .queryParam("newName", NEW_PROJECT_NAME) .when() - .post("job/%s/disable".formatted(projectName.get("name"))) + .post("job/%s/confirmRename".formatted(projectName.get("name"))) .then() .log().all() - .extract().response(); + .statusCode(302); - String location = response.getHeader("Location"); - - Response getResponse = RestAssured.given() + Response response = RestAssured.given() + .log().all() .auth().preemptive().basic(userName, apiToken) .baseUri(jenkinsUrl) .when() - .get(location) + .get("job/%s/api/json".formatted(NEW_PROJECT_NAME)) .then() .log().all() .statusCode(200) .extract().response(); - String responseBody = getResponse.getBody().asString(); - - Assert.assertEquals(response.getStatusCode(), 302); - Assert.assertEquals(getResponse.getStatusCode(), 200); - Assert.assertTrue(responseBody.contains("This project is currently disabled")); + String actualProjectName = response.jsonPath().getString("name"); + Assert.assertEquals(actualProjectName, NEW_PROJECT_NAME); } + } diff --git a/src/test/java/school/redrover/api/APIJenkinsTest.java b/src/test/java/school/redrover/api/APIJenkinsTest.java new file mode 100644 index 000000000..198006564 --- /dev/null +++ b/src/test/java/school/redrover/api/APIJenkinsTest.java @@ -0,0 +1,84 @@ +package school.redrover.api; + +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.restassured.response.Response; +import org.testng.Assert; +import org.testng.annotations.Test; +import school.redrover.common.APIBaseTest; + +import java.util.HashMap; +import java.util.Map; + +public class APIJenkinsTest extends APIBaseTest { + + @Test + public void jenkinsTest() { + RestAssured.given() + .log().all()// ← добавил что бы смотреть, что отправляю и что получаю(в конце лог) + .when() + .auth() + .preemptive() + .basic(userName, apiToken) + .when() + .get(jenkinsUrl + "api/json") + .then() + .log().all() + .statusCode(200); + } + + @Test + public void testCreatePiplineAndDisable() { + Map projectName = new HashMap<>(); + projectName.put("name", "Pipline"); + + String bodyPiplineXML = """ + + false + + + false + + """; + + RestAssured.given() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .contentType(ContentType.XML) + .queryParams(projectName) + .body(bodyPiplineXML) + .when() + .post("/createItem") + .then() + .log().all() + .statusCode(200); + + Response response = RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .post("job/%s/disable".formatted(projectName.get("name"))) + .then() + .log().all() + .extract().response(); + + String location = response.getHeader("Location"); + + Response getResponse = RestAssured.given() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .get(location) + .then() + .log().all() + .statusCode(200) + .extract().response(); + + String responseBody = getResponse.getBody().asString(); + + Assert.assertEquals(response.getStatusCode(), 302); + Assert.assertEquals(getResponse.getStatusCode(), 200); + Assert.assertTrue(responseBody.contains("This project is currently disabled")); + } +} diff --git a/src/test/java/school/redrover/APITest.java b/src/test/java/school/redrover/api/APITest.java similarity index 98% rename from src/test/java/school/redrover/APITest.java rename to src/test/java/school/redrover/api/APITest.java index 46ed678eb..64b108fce 100644 --- a/src/test/java/school/redrover/APITest.java +++ b/src/test/java/school/redrover/api/APITest.java @@ -1,4 +1,4 @@ -package school.redrover; +package school.redrover.api; import com.google.common.net.HttpHeaders; @@ -14,7 +14,6 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.util.Base64; import java.util.List; import java.util.Objects; diff --git a/src/test/java/school/redrover/common/BasePage.java b/src/test/java/school/redrover/common/BasePage.java index d3522bd38..4b82cfaf3 100644 --- a/src/test/java/school/redrover/common/BasePage.java +++ b/src/test/java/school/redrover/common/BasePage.java @@ -5,15 +5,16 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.PageFactory; +import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import school.redrover.component.common.JenkinsVersionFooterDropdown; -import school.redrover.component.common.SearchComponent; -import school.redrover.component.common.UserAccountIconDropdown; -import school.redrover.page.HomePage; -import school.redrover.page.JenkinsManagementPage; -import school.redrover.page.RestApiPage; -import school.redrover.page.UserStatusPage; +import school.redrover.ui.component.common.JenkinsVersionFooterDropdown; +import school.redrover.ui.component.common.SearchComponent; +import school.redrover.ui.component.common.UserAccountIconDropdown; +import school.redrover.ui.page.HomePage; +import school.redrover.ui.page.JenkinsManagementPage; +import school.redrover.ui.page.RestApiPage; +import school.redrover.ui.page.UserStatusPage; import java.util.Objects; @@ -74,7 +75,7 @@ public String getLogoText() { } public SearchComponent clickSearchButton() { - searchButton.click(); + getWait10().until(ExpectedConditions.visibilityOf(searchButton)).click(); return new SearchComponent(getDriver()).waitUntilComponentLoad(); } diff --git a/src/test/java/school/redrover/common/CucumberTest.java b/src/test/java/school/redrover/common/CucumberTest.java index ec10462d2..b539435f9 100644 --- a/src/test/java/school/redrover/common/CucumberTest.java +++ b/src/test/java/school/redrover/common/CucumberTest.java @@ -6,7 +6,7 @@ @CucumberOptions( features = "src/test/resources/cucumber", - glue = {"school.redrover.cucumber", "school.redrover.common"}, + glue = {"school.redrover.ui.cucumber", "school.redrover.common"}, plugin = {"pretty"}, tags = "not @ignore") public class CucumberTest extends AbstractTestNGCucumberTests { diff --git a/src/test/java/school/redrover/common/filter/FilterForTestsTest.java b/src/test/java/school/redrover/common/filter/FilterForTestsTest.java index b70506ed7..e9ad9a6b6 100644 --- a/src/test/java/school/redrover/common/filter/FilterForTestsTest.java +++ b/src/test/java/school/redrover/common/filter/FilterForTestsTest.java @@ -74,8 +74,8 @@ public void testModifiedTest() { public void testClassWithDependencies() { List changedFiles = List.of("M=src/test/java/school/redrover/page/BaseProjectStatusPage.java"); String dependenciesClasses = - "school.redrover.page.BaseProjectStatusPage=%s;".formatted(FakeTestClass.class.getName()) + - "school.redrover.page.BaseProjectStatusPage=%s".formatted(FakeTestClass2.class.getName()); + "school.redrover.ui.page.BaseProjectStatusPage=%s;".formatted(FakeTestClass.class.getName()) + + "school.redrover.ui.page.BaseProjectStatusPage=%s".formatted(FakeTestClass2.class.getName()); List methodList = List.of( new FilterMock.MethodInstanceImpl(FakeTestClass.class), @@ -97,7 +97,7 @@ public void testClassWithDependencies() { public void testOneDependency() { List changedFiles = List.of("M=src/test/java/school/redrover/page/ProjectStatusPage.java"); String dependenciesClasses = - "school.redrover.page.ProjectStatusPage=%s;".formatted(FakeTestClass.class.getName()); + "school.redrover.ui.page.ProjectStatusPage=%s;".formatted(FakeTestClass.class.getName()); List methodList = List.of(new FilterMock.MethodInstanceImpl(FakeTestClass.class)); @@ -115,8 +115,8 @@ public void testOneDependency() { public void testClassWithDependencyChain() { List changedFiles = List.of("M=src/test/java/school/redrover/page/BaseProjectStatusPage.java"); String dependenciesClasses = - "school.redrover.page.BaseProjectStatusPage=school.redrover.page.ProjectStatusPage" + - "school.redrover.page.ProjectStatusPage=%s".formatted(FakeTestClass.class.getName()); + "school.redrover.ui.page.BaseProjectStatusPage=school.redrover.ui.page.ProjectStatusPage" + + "school.redrover.ui.page.ProjectStatusPage=%s".formatted(FakeTestClass.class.getName()); List methodList = List.of( new FilterMock.MethodInstanceImpl(FakeTestClass.class) diff --git a/src/test/java/school/redrover/BreadcrumbsDropDownTest.java b/src/test/java/school/redrover/ui/BreadcrumbsDropDownTest.java similarity index 92% rename from src/test/java/school/redrover/BreadcrumbsDropDownTest.java rename to src/test/java/school/redrover/ui/BreadcrumbsDropDownTest.java index 0f9075d8e..4cdba4ecf 100644 --- a/src/test/java/school/redrover/BreadcrumbsDropDownTest.java +++ b/src/test/java/school/redrover/ui/BreadcrumbsDropDownTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.FolderStatusPage; -import school.redrover.page.HomePage; +import school.redrover.ui.page.FolderStatusPage; +import school.redrover.ui.page.HomePage; import java.util.List; diff --git a/src/test/java/school/redrover/BuildHistoryAccessTest.java b/src/test/java/school/redrover/ui/BuildHistoryAccessTest.java similarity index 92% rename from src/test/java/school/redrover/BuildHistoryAccessTest.java rename to src/test/java/school/redrover/ui/BuildHistoryAccessTest.java index 976cac0e6..ca18a891d 100644 --- a/src/test/java/school/redrover/BuildHistoryAccessTest.java +++ b/src/test/java/school/redrover/ui/BuildHistoryAccessTest.java @@ -1,11 +1,11 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.BuildHistoryOfJenkinsPage; -import school.redrover.page.HomePage; +import school.redrover.ui.page.BuildHistoryOfJenkinsPage; +import school.redrover.ui.page.HomePage; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/school/redrover/ConfigurationMatrixTest.java b/src/test/java/school/redrover/ui/ConfigurationMatrixTest.java similarity index 93% rename from src/test/java/school/redrover/ConfigurationMatrixTest.java rename to src/test/java/school/redrover/ui/ConfigurationMatrixTest.java index 00e633b1a..3f97089a4 100644 --- a/src/test/java/school/redrover/ConfigurationMatrixTest.java +++ b/src/test/java/school/redrover/ui/ConfigurationMatrixTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.FreestyleProjectConfigurationPage; -import school.redrover.page.HomePage; +import school.redrover.ui.page.FreestyleProjectConfigurationPage; +import school.redrover.ui.page.HomePage; import java.util.List; diff --git a/src/test/java/school/redrover/ConfigureAppearanceTest.java b/src/test/java/school/redrover/ui/ConfigureAppearanceTest.java similarity index 95% rename from src/test/java/school/redrover/ConfigureAppearanceTest.java rename to src/test/java/school/redrover/ui/ConfigureAppearanceTest.java index bce817ac0..f36526404 100644 --- a/src/test/java/school/redrover/ConfigureAppearanceTest.java +++ b/src/test/java/school/redrover/ui/ConfigureAppearanceTest.java @@ -1,9 +1,9 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; public class ConfigureAppearanceTest extends BaseTest { diff --git a/src/test/java/school/redrover/ConfigureSystemTest.java b/src/test/java/school/redrover/ui/ConfigureSystemTest.java similarity index 99% rename from src/test/java/school/redrover/ConfigureSystemTest.java rename to src/test/java/school/redrover/ui/ConfigureSystemTest.java index ced04b539..59e9a74aa 100644 --- a/src/test/java/school/redrover/ConfigureSystemTest.java +++ b/src/test/java/school/redrover/ui/ConfigureSystemTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; import java.util.*; diff --git a/src/test/java/school/redrover/CopyFieldTest.java b/src/test/java/school/redrover/ui/CopyFieldTest.java similarity index 94% rename from src/test/java/school/redrover/CopyFieldTest.java rename to src/test/java/school/redrover/ui/CopyFieldTest.java index 32561ff6a..7e50666eb 100644 --- a/src/test/java/school/redrover/CopyFieldTest.java +++ b/src/test/java/school/redrover/ui/CopyFieldTest.java @@ -1,9 +1,9 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; import java.util.List; diff --git a/src/test/java/school/redrover/CreateNewItemTest.java b/src/test/java/school/redrover/ui/CreateNewItemTest.java similarity index 97% rename from src/test/java/school/redrover/CreateNewItemTest.java rename to src/test/java/school/redrover/ui/CreateNewItemTest.java index 83d69ca46..09eb4eb79 100644 --- a/src/test/java/school/redrover/CreateNewItemTest.java +++ b/src/test/java/school/redrover/ui/CreateNewItemTest.java @@ -1,4 +1,4 @@ -package school.redrover; +package school.redrover.ui; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; @@ -8,9 +8,9 @@ import org.testng.annotations.Test; import org.openqa.selenium.JavascriptExecutor; import school.redrover.common.BaseTest; -import school.redrover.page.FreestyleProjectStatusPage; -import school.redrover.page.HomePage; -import school.redrover.page.NewItemPage; +import school.redrover.ui.page.FreestyleProjectStatusPage; +import school.redrover.ui.page.HomePage; +import school.redrover.ui.page.NewItemPage; import java.time.Duration; import java.util.List; diff --git a/src/test/java/school/redrover/CredentialsTest.java b/src/test/java/school/redrover/ui/CredentialsTest.java similarity index 96% rename from src/test/java/school/redrover/CredentialsTest.java rename to src/test/java/school/redrover/ui/CredentialsTest.java index 0704016ff..5466933f3 100644 --- a/src/test/java/school/redrover/CredentialsTest.java +++ b/src/test/java/school/redrover/ui/CredentialsTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.openqa.selenium.WebElement; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; import java.util.List; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/test/java/school/redrover/DashboardTest.java b/src/test/java/school/redrover/ui/DashboardTest.java similarity index 99% rename from src/test/java/school/redrover/DashboardTest.java rename to src/test/java/school/redrover/ui/DashboardTest.java index f9dae1032..7875f4bb5 100644 --- a/src/test/java/school/redrover/DashboardTest.java +++ b/src/test/java/school/redrover/ui/DashboardTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.*; +import school.redrover.ui.page.*; import java.util.List; diff --git a/src/test/java/school/redrover/DescriptionTest.java b/src/test/java/school/redrover/ui/DescriptionTest.java similarity index 94% rename from src/test/java/school/redrover/DescriptionTest.java rename to src/test/java/school/redrover/ui/DescriptionTest.java index d7d63476b..f742b4f75 100644 --- a/src/test/java/school/redrover/DescriptionTest.java +++ b/src/test/java/school/redrover/ui/DescriptionTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Ignore; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; public class DescriptionTest extends BaseTest { diff --git a/src/test/java/school/redrover/FolderConfigurationTest.java b/src/test/java/school/redrover/ui/FolderConfigurationTest.java similarity index 99% rename from src/test/java/school/redrover/FolderConfigurationTest.java rename to src/test/java/school/redrover/ui/FolderConfigurationTest.java index 4dcf2e062..f8940ba19 100644 --- a/src/test/java/school/redrover/FolderConfigurationTest.java +++ b/src/test/java/school/redrover/ui/FolderConfigurationTest.java @@ -1,9 +1,9 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.*; +import school.redrover.ui.page.*; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/school/redrover/FolderManagementTest.java b/src/test/java/school/redrover/ui/FolderManagementTest.java similarity index 98% rename from src/test/java/school/redrover/FolderManagementTest.java rename to src/test/java/school/redrover/ui/FolderManagementTest.java index 56bfd452d..c4032f094 100644 --- a/src/test/java/school/redrover/FolderManagementTest.java +++ b/src/test/java/school/redrover/ui/FolderManagementTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.*; +import school.redrover.ui.page.*; public class FolderManagementTest extends BaseTest { diff --git a/src/test/java/school/redrover/FolderSettingsTest.java b/src/test/java/school/redrover/ui/FolderSettingsTest.java similarity index 92% rename from src/test/java/school/redrover/FolderSettingsTest.java rename to src/test/java/school/redrover/ui/FolderSettingsTest.java index 52db3cfff..ccb26acc9 100644 --- a/src/test/java/school/redrover/FolderSettingsTest.java +++ b/src/test/java/school/redrover/ui/FolderSettingsTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.FolderStatusPage; -import school.redrover.page.HomePage; +import school.redrover.ui.page.FolderStatusPage; +import school.redrover.ui.page.HomePage; import java.util.List; diff --git a/src/test/java/school/redrover/FolderTest.java b/src/test/java/school/redrover/ui/FolderTest.java similarity index 98% rename from src/test/java/school/redrover/FolderTest.java rename to src/test/java/school/redrover/ui/FolderTest.java index f3149b018..65c7f35bb 100644 --- a/src/test/java/school/redrover/FolderTest.java +++ b/src/test/java/school/redrover/ui/FolderTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.FolderStatusPage; -import school.redrover.page.HomePage; +import school.redrover.ui.page.FolderStatusPage; +import school.redrover.ui.page.HomePage; import java.util.List; diff --git a/src/test/java/school/redrover/FooterTest.java b/src/test/java/school/redrover/ui/FooterTest.java similarity index 98% rename from src/test/java/school/redrover/FooterTest.java rename to src/test/java/school/redrover/ui/FooterTest.java index 43a11dc5b..febbe5382 100644 --- a/src/test/java/school/redrover/FooterTest.java +++ b/src/test/java/school/redrover/ui/FooterTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; import school.redrover.common.PageUtils; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; import java.util.List; diff --git a/src/test/java/school/redrover/FreestyleProjectTest.java b/src/test/java/school/redrover/ui/FreestyleProjectTest.java similarity index 98% rename from src/test/java/school/redrover/FreestyleProjectTest.java rename to src/test/java/school/redrover/ui/FreestyleProjectTest.java index b6e501354..32b70412a 100644 --- a/src/test/java/school/redrover/FreestyleProjectTest.java +++ b/src/test/java/school/redrover/ui/FreestyleProjectTest.java @@ -1,11 +1,11 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.FreestyleProjectConfigurationPage; -import school.redrover.page.FreestyleProjectStatusPage; -import school.redrover.page.HomePage; +import school.redrover.ui.page.FreestyleProjectConfigurationPage; +import school.redrover.ui.page.FreestyleProjectStatusPage; +import school.redrover.ui.page.HomePage; import java.util.List; public class FreestyleProjectTest extends BaseTest { diff --git a/src/test/java/school/redrover/HeaderTest.java b/src/test/java/school/redrover/ui/HeaderTest.java similarity index 91% rename from src/test/java/school/redrover/HeaderTest.java rename to src/test/java/school/redrover/ui/HeaderTest.java index eb5df8771..aee320bfa 100644 --- a/src/test/java/school/redrover/HeaderTest.java +++ b/src/test/java/school/redrover/ui/HeaderTest.java @@ -1,12 +1,12 @@ -package school.redrover; +package school.redrover.ui; import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.FolderStatusPage; -import school.redrover.page.HomePage; +import school.redrover.ui.page.FolderStatusPage; +import school.redrover.ui.page.HomePage; import java.util.List; diff --git a/src/test/java/school/redrover/JenkinsManagementTest.java b/src/test/java/school/redrover/ui/JenkinsManagementTest.java similarity index 98% rename from src/test/java/school/redrover/JenkinsManagementTest.java rename to src/test/java/school/redrover/ui/JenkinsManagementTest.java index 378bc602c..955666bf9 100644 --- a/src/test/java/school/redrover/JenkinsManagementTest.java +++ b/src/test/java/school/redrover/ui/JenkinsManagementTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; import java.util.List; diff --git a/src/test/java/school/redrover/MultiConfigurationProjectTest.java b/src/test/java/school/redrover/ui/MultiConfigurationProjectTest.java similarity index 98% rename from src/test/java/school/redrover/MultiConfigurationProjectTest.java rename to src/test/java/school/redrover/ui/MultiConfigurationProjectTest.java index e75526112..cc538207b 100644 --- a/src/test/java/school/redrover/MultiConfigurationProjectTest.java +++ b/src/test/java/school/redrover/ui/MultiConfigurationProjectTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.*; +import school.redrover.ui.page.*; public class MultiConfigurationProjectTest extends BaseTest { diff --git a/src/test/java/school/redrover/MultibranchPipelineTest.java b/src/test/java/school/redrover/ui/MultibranchPipelineTest.java similarity index 98% rename from src/test/java/school/redrover/MultibranchPipelineTest.java rename to src/test/java/school/redrover/ui/MultibranchPipelineTest.java index 4c475f0a9..aac43e381 100644 --- a/src/test/java/school/redrover/MultibranchPipelineTest.java +++ b/src/test/java/school/redrover/ui/MultibranchPipelineTest.java @@ -1,11 +1,11 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; -import school.redrover.page.MultibranchProjectStatusPage; +import school.redrover.ui.page.HomePage; +import school.redrover.ui.page.MultibranchProjectStatusPage; import java.util.List; diff --git a/src/test/java/school/redrover/NavigateToDashboardTest.java b/src/test/java/school/redrover/ui/NavigateToDashboardTest.java similarity index 96% rename from src/test/java/school/redrover/NavigateToDashboardTest.java rename to src/test/java/school/redrover/ui/NavigateToDashboardTest.java index ef4e38408..019350b94 100644 --- a/src/test/java/school/redrover/NavigateToDashboardTest.java +++ b/src/test/java/school/redrover/ui/NavigateToDashboardTest.java @@ -1,9 +1,9 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; import java.util.List; public class NavigateToDashboardTest extends BaseTest { diff --git a/src/test/java/school/redrover/NodeTest.java b/src/test/java/school/redrover/ui/NodeTest.java similarity index 97% rename from src/test/java/school/redrover/NodeTest.java rename to src/test/java/school/redrover/ui/NodeTest.java index 9930c80df..43d3f3201 100644 --- a/src/test/java/school/redrover/NodeTest.java +++ b/src/test/java/school/redrover/ui/NodeTest.java @@ -1,9 +1,9 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; public class NodeTest extends BaseTest { private static final String EXP_NODE_NAME = "SecondNode"; diff --git a/src/test/java/school/redrover/OrganizationFolderConfigurationTest.java b/src/test/java/school/redrover/ui/OrganizationFolderConfigurationTest.java similarity index 94% rename from src/test/java/school/redrover/OrganizationFolderConfigurationTest.java rename to src/test/java/school/redrover/ui/OrganizationFolderConfigurationTest.java index c4a963392..9223771cd 100644 --- a/src/test/java/school/redrover/OrganizationFolderConfigurationTest.java +++ b/src/test/java/school/redrover/ui/OrganizationFolderConfigurationTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; -import school.redrover.page.OrganizationFolderStatusPage; +import school.redrover.ui.page.HomePage; +import school.redrover.ui.page.OrganizationFolderStatusPage; import java.util.List; diff --git a/src/test/java/school/redrover/OrganizationFolderTest.java b/src/test/java/school/redrover/ui/OrganizationFolderTest.java similarity index 94% rename from src/test/java/school/redrover/OrganizationFolderTest.java rename to src/test/java/school/redrover/ui/OrganizationFolderTest.java index 7b9f90dc4..9d03df98a 100644 --- a/src/test/java/school/redrover/OrganizationFolderTest.java +++ b/src/test/java/school/redrover/ui/OrganizationFolderTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; -import school.redrover.page.OrganizationFolderStatusPage; +import school.redrover.ui.page.HomePage; +import school.redrover.ui.page.OrganizationFolderStatusPage; import java.util.List; diff --git a/src/test/java/school/redrover/PipelineBuildTriggersTest.java b/src/test/java/school/redrover/ui/PipelineBuildTriggersTest.java similarity index 91% rename from src/test/java/school/redrover/PipelineBuildTriggersTest.java rename to src/test/java/school/redrover/ui/PipelineBuildTriggersTest.java index 85afff733..06ce638a1 100644 --- a/src/test/java/school/redrover/PipelineBuildTriggersTest.java +++ b/src/test/java/school/redrover/ui/PipelineBuildTriggersTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.openqa.selenium.*; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; public class PipelineBuildTriggersTest extends BaseTest { diff --git a/src/test/java/school/redrover/PipelineConfigurationTest.java b/src/test/java/school/redrover/ui/PipelineConfigurationTest.java similarity index 97% rename from src/test/java/school/redrover/PipelineConfigurationTest.java rename to src/test/java/school/redrover/ui/PipelineConfigurationTest.java index 93e8f4a4a..a2ddfaf1d 100644 --- a/src/test/java/school/redrover/PipelineConfigurationTest.java +++ b/src/test/java/school/redrover/ui/PipelineConfigurationTest.java @@ -1,11 +1,11 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.PipelineProjectConfigurationPage; -import school.redrover.page.HomePage; -import school.redrover.page.PipelineProjectStatusPage; +import school.redrover.ui.page.PipelineProjectConfigurationPage; +import school.redrover.ui.page.HomePage; +import school.redrover.ui.page.PipelineProjectStatusPage; import java.util.List; diff --git a/src/test/java/school/redrover/PipelineTest.java b/src/test/java/school/redrover/ui/PipelineTest.java similarity index 98% rename from src/test/java/school/redrover/PipelineTest.java rename to src/test/java/school/redrover/ui/PipelineTest.java index 577daaa03..e170e3ee6 100644 --- a/src/test/java/school/redrover/PipelineTest.java +++ b/src/test/java/school/redrover/ui/PipelineTest.java @@ -1,12 +1,12 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; -import school.redrover.page.PipelineProjectConfigurationPage; -import school.redrover.page.PipelineProjectStatusPage; +import school.redrover.ui.page.HomePage; +import school.redrover.ui.page.PipelineProjectConfigurationPage; +import school.redrover.ui.page.PipelineProjectStatusPage; import java.util.List; diff --git a/src/test/java/school/redrover/SignInOutTest.java b/src/test/java/school/redrover/ui/SignInOutTest.java similarity index 90% rename from src/test/java/school/redrover/SignInOutTest.java rename to src/test/java/school/redrover/ui/SignInOutTest.java index 01a0a4423..7e25e2539 100644 --- a/src/test/java/school/redrover/SignInOutTest.java +++ b/src/test/java/school/redrover/ui/SignInOutTest.java @@ -1,11 +1,11 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; import school.redrover.common.ProjectUtils; -import school.redrover.page.HomePage; -import school.redrover.page.LoginPage; +import school.redrover.ui.page.HomePage; +import school.redrover.ui.page.LoginPage; public class SignInOutTest extends BaseTest { diff --git a/src/test/java/school/redrover/StatusAdminTest.java b/src/test/java/school/redrover/ui/StatusAdminTest.java similarity index 93% rename from src/test/java/school/redrover/StatusAdminTest.java rename to src/test/java/school/redrover/ui/StatusAdminTest.java index dd26f6477..29753483d 100644 --- a/src/test/java/school/redrover/StatusAdminTest.java +++ b/src/test/java/school/redrover/ui/StatusAdminTest.java @@ -1,9 +1,9 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; public class StatusAdminTest extends BaseTest { diff --git a/src/test/java/school/redrover/UserLoggedInTest.java b/src/test/java/school/redrover/ui/UserLoggedInTest.java similarity index 96% rename from src/test/java/school/redrover/UserLoggedInTest.java rename to src/test/java/school/redrover/ui/UserLoggedInTest.java index ad6ccf3e5..13584e0b5 100644 --- a/src/test/java/school/redrover/UserLoggedInTest.java +++ b/src/test/java/school/redrover/ui/UserLoggedInTest.java @@ -1,10 +1,10 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import org.testng.annotations.Ignore; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; public class UserLoggedInTest extends BaseTest { diff --git a/src/test/java/school/redrover/UserTest.java b/src/test/java/school/redrover/ui/UserTest.java similarity index 98% rename from src/test/java/school/redrover/UserTest.java rename to src/test/java/school/redrover/ui/UserTest.java index e901e1c21..113ea77b8 100644 --- a/src/test/java/school/redrover/UserTest.java +++ b/src/test/java/school/redrover/ui/UserTest.java @@ -1,9 +1,9 @@ -package school.redrover; +package school.redrover.ui; import org.testng.Assert; import org.testng.annotations.Test; import school.redrover.common.BaseTest; -import school.redrover.page.HomePage; +import school.redrover.ui.page.HomePage; import java.util.List; diff --git a/src/test/java/school/redrover/component/BaseComponent.java b/src/test/java/school/redrover/ui/component/BaseComponent.java similarity index 91% rename from src/test/java/school/redrover/component/BaseComponent.java rename to src/test/java/school/redrover/ui/component/BaseComponent.java index 9e63c0473..051c30acf 100644 --- a/src/test/java/school/redrover/component/BaseComponent.java +++ b/src/test/java/school/redrover/ui/component/BaseComponent.java @@ -1,4 +1,4 @@ -package school.redrover.component; +package school.redrover.ui.component; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.PageFactory; diff --git a/src/test/java/school/redrover/component/common/JenkinsVersionFooterDropdown.java b/src/test/java/school/redrover/ui/component/common/JenkinsVersionFooterDropdown.java similarity index 90% rename from src/test/java/school/redrover/component/common/JenkinsVersionFooterDropdown.java rename to src/test/java/school/redrover/ui/component/common/JenkinsVersionFooterDropdown.java index c0d34064b..12b0cc0a0 100644 --- a/src/test/java/school/redrover/component/common/JenkinsVersionFooterDropdown.java +++ b/src/test/java/school/redrover/ui/component/common/JenkinsVersionFooterDropdown.java @@ -1,10 +1,10 @@ -package school.redrover.component.common; +package school.redrover.ui.component.common; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; -import school.redrover.component.BaseComponent; +import school.redrover.ui.component.BaseComponent; import java.util.List; diff --git a/src/test/java/school/redrover/component/common/SearchComponent.java b/src/test/java/school/redrover/ui/component/common/SearchComponent.java similarity index 92% rename from src/test/java/school/redrover/component/common/SearchComponent.java rename to src/test/java/school/redrover/ui/component/common/SearchComponent.java index 6801812f0..6554c0fde 100644 --- a/src/test/java/school/redrover/component/common/SearchComponent.java +++ b/src/test/java/school/redrover/ui/component/common/SearchComponent.java @@ -1,13 +1,13 @@ -package school.redrover.component.common; +package school.redrover.ui.component.common; import org.openqa.selenium.*; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.PageUtils; -import school.redrover.component.BaseComponent; -import school.redrover.page.FreestyleProjectStatusPage; -import school.redrover.page.UserStatusPage; +import school.redrover.ui.component.BaseComponent; +import school.redrover.ui.page.FreestyleProjectStatusPage; +import school.redrover.ui.page.UserStatusPage; import java.util.ArrayList; import java.util.List; @@ -86,7 +86,7 @@ public boolean isNoResultsFound(String jobName) { } public List getSearchResultsAndClose() { - getWait5().until(ExpectedConditions.presenceOfElementLocated(By.className("jenkins-command-palette__results__heading"))); + getWait5().until(ExpectedConditions.visibilityOfElementLocated(By.className("jenkins-command-palette__results__heading"))); List searchResultsTexts = new ArrayList<>(); for (WebElement element : searchResults) { diff --git a/src/test/java/school/redrover/component/common/UserAccountIconDropdown.java b/src/test/java/school/redrover/ui/component/common/UserAccountIconDropdown.java similarity index 88% rename from src/test/java/school/redrover/component/common/UserAccountIconDropdown.java rename to src/test/java/school/redrover/ui/component/common/UserAccountIconDropdown.java index 2674801f1..a7caadafc 100644 --- a/src/test/java/school/redrover/component/common/UserAccountIconDropdown.java +++ b/src/test/java/school/redrover/ui/component/common/UserAccountIconDropdown.java @@ -1,13 +1,13 @@ -package school.redrover.component.common; +package school.redrover.ui.component.common; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.PageUtils; -import school.redrover.component.BaseComponent; -import school.redrover.page.LoginPage; -import school.redrover.page.UserStatusPage; +import school.redrover.ui.component.BaseComponent; +import school.redrover.ui.page.LoginPage; +import school.redrover.ui.page.UserStatusPage; import java.util.function.Consumer; diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/BaseSidebarComponent.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java similarity index 87% rename from src/test/java/school/redrover/component/project/status_page/sidebar/BaseSidebarComponent.java rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java index cf6bb4df6..e45e1780e 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/BaseSidebarComponent.java +++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java @@ -1,13 +1,13 @@ -package school.redrover.component.project.status_page.sidebar; +package school.redrover.ui.component.project.status_page.sidebar; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import school.redrover.component.BaseComponent; -import school.redrover.page.BaseProjectConfigurationPage; -import school.redrover.page.BaseProjectStatusPage; -import school.redrover.page.ProjectMovePage; -import school.redrover.page.ProjectRenamingPage; +import school.redrover.ui.page.ProjectMovePage; +import school.redrover.ui.component.BaseComponent; +import school.redrover.ui.page.BaseProjectConfigurationPage; +import school.redrover.ui.page.BaseProjectStatusPage; +import school.redrover.ui.page.ProjectRenamingPage; import java.util.function.Function; diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/FolderSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java similarity index 86% rename from src/test/java/school/redrover/component/project/status_page/sidebar/FolderSidebar.java rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java index e85911b9c..b1fc1ed12 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/FolderSidebar.java +++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java @@ -1,12 +1,12 @@ -package school.redrover.component.project.status_page.sidebar; +package school.redrover.ui.component.project.status_page.sidebar; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; -import school.redrover.page.*; -import school.redrover.trait.project_sidebar.SidebarBuildHistoryTrait; -import school.redrover.trait.project_sidebar.SidebarCredentialsTrait; +import school.redrover.ui.page.*; +import school.redrover.ui.trait.project_sidebar.SidebarBuildHistoryTrait; +import school.redrover.ui.trait.project_sidebar.SidebarCredentialsTrait; public class FolderSidebar extends BaseSidebarComponent diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/FreestyleProjectSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FreestyleProjectSidebar.java similarity index 90% rename from src/test/java/school/redrover/component/project/status_page/sidebar/FreestyleProjectSidebar.java rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/FreestyleProjectSidebar.java index 20649d091..41d267086 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/FreestyleProjectSidebar.java +++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FreestyleProjectSidebar.java @@ -1,8 +1,8 @@ -package school.redrover.component.project.status_page.sidebar; +package school.redrover.ui.component.project.status_page.sidebar; import org.openqa.selenium.WebDriver; -import school.redrover.page.*; -import school.redrover.trait.project_sidebar.*; +import school.redrover.ui.page.*; +import school.redrover.ui.trait.project_sidebar.*; public class FreestyleProjectSidebar extends BaseSidebarComponent< diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiBranchProjectSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiBranchProjectSidebar.java similarity index 72% rename from src/test/java/school/redrover/component/project/status_page/sidebar/MultiBranchProjectSidebar.java rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiBranchProjectSidebar.java index d6105e25b..70b6c5e48 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiBranchProjectSidebar.java +++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiBranchProjectSidebar.java @@ -1,9 +1,12 @@ -package school.redrover.component.project.status_page.sidebar; +package school.redrover.ui.component.project.status_page.sidebar; import org.openqa.selenium.WebDriver; -import school.redrover.page.*; -import school.redrover.trait.project_sidebar.SidebarBuildHistoryTrait; -import school.redrover.trait.project_sidebar.SidebarCredentialsTrait; +import school.redrover.ui.page.MultiBranchProjectBuildHistoryPage; +import school.redrover.ui.page.MultiBranchProjectCredentialsPage; +import school.redrover.ui.page.MultibranchProjectConfigurationPage; +import school.redrover.ui.page.MultibranchProjectStatusPage; +import school.redrover.ui.trait.project_sidebar.SidebarBuildHistoryTrait; +import school.redrover.ui.trait.project_sidebar.SidebarCredentialsTrait; public class MultiBranchProjectSidebar extends BaseSidebarComponent< diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiConfigProjectSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiConfigProjectSidebar.java similarity index 90% rename from src/test/java/school/redrover/component/project/status_page/sidebar/MultiConfigProjectSidebar.java rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiConfigProjectSidebar.java index 5112b8f39..324424295 100644 --- a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiConfigProjectSidebar.java +++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiConfigProjectSidebar.java @@ -1,8 +1,8 @@ -package school.redrover.component.project.status_page.sidebar; +package school.redrover.ui.component.project.status_page.sidebar; import org.openqa.selenium.WebDriver; -import school.redrover.page.*; -import school.redrover.trait.project_sidebar.*; +import school.redrover.ui.page.*; +import school.redrover.ui.trait.project_sidebar.*; public class MultiConfigProjectSidebar extends BaseSidebarComponent - implements SidebarChangesTrait, SidebarBuildNowTrait, SidebarCredentialsTrait { + implements SidebarChangesTrait, + SidebarBuildNowTrait, + SidebarCredentialsTrait { public PipelineProjectSidebar(WebDriver driver) { super(driver, PipelineProjectStatusPage::new); @@ -39,4 +44,5 @@ public PipelineProjectChangesPage getProjectChangesPage() { public PipelineProjectCredentialsPage getProjectCredentialsPage() { return new PipelineProjectCredentialsPage(getDriver()); } + } diff --git a/src/test/java/school/redrover/cucumber/FreestyleSteps.java b/src/test/java/school/redrover/ui/cucumber/FreestyleSteps.java similarity index 93% rename from src/test/java/school/redrover/cucumber/FreestyleSteps.java rename to src/test/java/school/redrover/ui/cucumber/FreestyleSteps.java index b900429be..6e50fca15 100644 --- a/src/test/java/school/redrover/cucumber/FreestyleSteps.java +++ b/src/test/java/school/redrover/ui/cucumber/FreestyleSteps.java @@ -1,14 +1,14 @@ -package school.redrover.cucumber; +package school.redrover.ui.cucumber; import io.cucumber.java.en.And; import io.cucumber.java.en.Then; import io.cucumber.java.en.When; import org.testng.Assert; -import school.redrover.page.NewItemPage; -import school.redrover.page.FreestyleProjectConfigurationPage; -import school.redrover.page.FreestyleProjectStatusPage; -import school.redrover.page.HomePage; +import school.redrover.ui.page.NewItemPage; +import school.redrover.ui.page.FreestyleProjectConfigurationPage; +import school.redrover.ui.page.FreestyleProjectStatusPage; +import school.redrover.ui.page.HomePage; import school.redrover.common.CucumberDriver; import school.redrover.common.ProjectUtils; diff --git a/src/test/java/school/redrover/cucumber/ViewSteps.java b/src/test/java/school/redrover/ui/cucumber/ViewSteps.java similarity index 98% rename from src/test/java/school/redrover/cucumber/ViewSteps.java rename to src/test/java/school/redrover/ui/cucumber/ViewSteps.java index bee7936c4..1280f45a2 100644 --- a/src/test/java/school/redrover/cucumber/ViewSteps.java +++ b/src/test/java/school/redrover/ui/cucumber/ViewSteps.java @@ -1,10 +1,10 @@ -package school.redrover.cucumber; +package school.redrover.ui.cucumber; import io.cucumber.java.en.And; import io.cucumber.java.en.Then; import io.cucumber.java.en.When; import org.testng.Assert; -import school.redrover.page.*; +import school.redrover.ui.page.*; import school.redrover.common.CucumberDriver; import school.redrover.common.ProjectUtils; diff --git a/src/test/java/school/redrover/page/AppearancePage.java b/src/test/java/school/redrover/ui/page/AppearancePage.java similarity index 98% rename from src/test/java/school/redrover/page/AppearancePage.java rename to src/test/java/school/redrover/ui/page/AppearancePage.java index d53d58b5f..3ca23f6a5 100644 --- a/src/test/java/school/redrover/page/AppearancePage.java +++ b/src/test/java/school/redrover/ui/page/AppearancePage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/ArchitectingForScalePage.java b/src/test/java/school/redrover/ui/page/ArchitectingForScalePage.java similarity index 90% rename from src/test/java/school/redrover/page/ArchitectingForScalePage.java rename to src/test/java/school/redrover/ui/page/ArchitectingForScalePage.java index d84cd07d1..8083a3a78 100644 --- a/src/test/java/school/redrover/page/ArchitectingForScalePage.java +++ b/src/test/java/school/redrover/ui/page/ArchitectingForScalePage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/BaseProjectConfigurationPage.java b/src/test/java/school/redrover/ui/page/BaseProjectConfigurationPage.java similarity index 97% rename from src/test/java/school/redrover/page/BaseProjectConfigurationPage.java rename to src/test/java/school/redrover/ui/page/BaseProjectConfigurationPage.java index fdb1ff323..eade3b46e 100644 --- a/src/test/java/school/redrover/page/BaseProjectConfigurationPage.java +++ b/src/test/java/school/redrover/ui/page/BaseProjectConfigurationPage.java @@ -1,6 +1,5 @@ -package school.redrover.page; +package school.redrover.ui.page; -import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/src/test/java/school/redrover/page/BaseProjectStatusPage.java b/src/test/java/school/redrover/ui/page/BaseProjectStatusPage.java similarity index 79% rename from src/test/java/school/redrover/page/BaseProjectStatusPage.java rename to src/test/java/school/redrover/ui/page/BaseProjectStatusPage.java index 712efcd2a..cdd66d0b2 100644 --- a/src/test/java/school/redrover/page/BaseProjectStatusPage.java +++ b/src/test/java/school/redrover/ui/page/BaseProjectStatusPage.java @@ -1,8 +1,8 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; -import school.redrover.component.project.status_page.sidebar.BaseSidebarComponent; +import school.redrover.ui.component.project.status_page.sidebar.BaseSidebarComponent; public abstract class BaseProjectStatusPage< diff --git a/src/test/java/school/redrover/page/BuildHistoryOfJenkinsPage.java b/src/test/java/school/redrover/ui/page/BuildHistoryOfJenkinsPage.java similarity index 94% rename from src/test/java/school/redrover/page/BuildHistoryOfJenkinsPage.java rename to src/test/java/school/redrover/ui/page/BuildHistoryOfJenkinsPage.java index af08b55c3..fed2dcfec 100644 --- a/src/test/java/school/redrover/page/BuildHistoryOfJenkinsPage.java +++ b/src/test/java/school/redrover/ui/page/BuildHistoryOfJenkinsPage.java @@ -1,10 +1,9 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.BasePage; import java.util.List; diff --git a/src/test/java/school/redrover/page/CloudsPage.java b/src/test/java/school/redrover/ui/page/CloudsPage.java similarity index 86% rename from src/test/java/school/redrover/page/CloudsPage.java rename to src/test/java/school/redrover/ui/page/CloudsPage.java index 522418934..f76a86188 100644 --- a/src/test/java/school/redrover/page/CloudsPage.java +++ b/src/test/java/school/redrover/ui/page/CloudsPage.java @@ -1,9 +1,8 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/CreateViewPage.java b/src/test/java/school/redrover/ui/page/CreateViewPage.java similarity index 97% rename from src/test/java/school/redrover/page/CreateViewPage.java rename to src/test/java/school/redrover/ui/page/CreateViewPage.java index 92f2c7baa..cea498809 100644 --- a/src/test/java/school/redrover/page/CreateViewPage.java +++ b/src/test/java/school/redrover/ui/page/CreateViewPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/EditViewPage.java b/src/test/java/school/redrover/ui/page/EditViewPage.java similarity index 98% rename from src/test/java/school/redrover/page/EditViewPage.java rename to src/test/java/school/redrover/ui/page/EditViewPage.java index 771036b41..de87f78dc 100644 --- a/src/test/java/school/redrover/page/EditViewPage.java +++ b/src/test/java/school/redrover/ui/page/EditViewPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; diff --git a/src/test/java/school/redrover/page/ErrorPage.java b/src/test/java/school/redrover/ui/page/ErrorPage.java similarity index 94% rename from src/test/java/school/redrover/page/ErrorPage.java rename to src/test/java/school/redrover/ui/page/ErrorPage.java index 764d3f4e8..6de37b4b2 100644 --- a/src/test/java/school/redrover/page/ErrorPage.java +++ b/src/test/java/school/redrover/ui/page/ErrorPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/FolderBuildHistoryPage.java b/src/test/java/school/redrover/ui/page/FolderBuildHistoryPage.java similarity index 91% rename from src/test/java/school/redrover/page/FolderBuildHistoryPage.java rename to src/test/java/school/redrover/ui/page/FolderBuildHistoryPage.java index bb2b554eb..73d89c622 100644 --- a/src/test/java/school/redrover/page/FolderBuildHistoryPage.java +++ b/src/test/java/school/redrover/ui/page/FolderBuildHistoryPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/FolderConfigurationPage.java b/src/test/java/school/redrover/ui/page/FolderConfigurationPage.java similarity index 99% rename from src/test/java/school/redrover/page/FolderConfigurationPage.java rename to src/test/java/school/redrover/ui/page/FolderConfigurationPage.java index 63d99eedd..4bf3eac6a 100644 --- a/src/test/java/school/redrover/page/FolderConfigurationPage.java +++ b/src/test/java/school/redrover/ui/page/FolderConfigurationPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/FolderCreateViewPage.java b/src/test/java/school/redrover/ui/page/FolderCreateViewPage.java similarity index 97% rename from src/test/java/school/redrover/page/FolderCreateViewPage.java rename to src/test/java/school/redrover/ui/page/FolderCreateViewPage.java index b1bccfb4c..5e39d0332 100644 --- a/src/test/java/school/redrover/page/FolderCreateViewPage.java +++ b/src/test/java/school/redrover/ui/page/FolderCreateViewPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/FolderCredentialsPage.java b/src/test/java/school/redrover/ui/page/FolderCredentialsPage.java similarity index 92% rename from src/test/java/school/redrover/page/FolderCredentialsPage.java rename to src/test/java/school/redrover/ui/page/FolderCredentialsPage.java index c8829897a..a9fbceffb 100644 --- a/src/test/java/school/redrover/page/FolderCredentialsPage.java +++ b/src/test/java/school/redrover/ui/page/FolderCredentialsPage.java @@ -1,11 +1,10 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/FolderStatusPage.java b/src/test/java/school/redrover/ui/page/FolderStatusPage.java similarity index 98% rename from src/test/java/school/redrover/page/FolderStatusPage.java rename to src/test/java/school/redrover/ui/page/FolderStatusPage.java index 8a785d881..e166e89a6 100644 --- a/src/test/java/school/redrover/page/FolderStatusPage.java +++ b/src/test/java/school/redrover/ui/page/FolderStatusPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; @@ -7,7 +7,7 @@ import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.PageUtils; -import school.redrover.component.project.status_page.sidebar.FolderSidebar; +import school.redrover.ui.component.project.status_page.sidebar.FolderSidebar; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/school/redrover/page/FolderViewPage.java b/src/test/java/school/redrover/ui/page/FolderViewPage.java similarity index 90% rename from src/test/java/school/redrover/page/FolderViewPage.java rename to src/test/java/school/redrover/ui/page/FolderViewPage.java index 78e722dfd..11d5189b7 100644 --- a/src/test/java/school/redrover/page/FolderViewPage.java +++ b/src/test/java/school/redrover/ui/page/FolderViewPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/FreestyleProjectChangesPage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectChangesPage.java similarity index 91% rename from src/test/java/school/redrover/page/FreestyleProjectChangesPage.java rename to src/test/java/school/redrover/ui/page/FreestyleProjectChangesPage.java index 4693437be..da45e69c5 100644 --- a/src/test/java/school/redrover/page/FreestyleProjectChangesPage.java +++ b/src/test/java/school/redrover/ui/page/FreestyleProjectChangesPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/FreestyleProjectConfigurationPage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectConfigurationPage.java similarity index 99% rename from src/test/java/school/redrover/page/FreestyleProjectConfigurationPage.java rename to src/test/java/school/redrover/ui/page/FreestyleProjectConfigurationPage.java index 848899c63..6177cb4eb 100644 --- a/src/test/java/school/redrover/page/FreestyleProjectConfigurationPage.java +++ b/src/test/java/school/redrover/ui/page/FreestyleProjectConfigurationPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; diff --git a/src/test/java/school/redrover/page/FreestyleProjectCredentialsPage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectCredentialsPage.java similarity index 91% rename from src/test/java/school/redrover/page/FreestyleProjectCredentialsPage.java rename to src/test/java/school/redrover/ui/page/FreestyleProjectCredentialsPage.java index a8b502b32..3fb4d87e0 100644 --- a/src/test/java/school/redrover/page/FreestyleProjectCredentialsPage.java +++ b/src/test/java/school/redrover/ui/page/FreestyleProjectCredentialsPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/FreestyleProjectStatusPage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectStatusPage.java similarity index 91% rename from src/test/java/school/redrover/page/FreestyleProjectStatusPage.java rename to src/test/java/school/redrover/ui/page/FreestyleProjectStatusPage.java index c0ebc1e71..cd87f483d 100644 --- a/src/test/java/school/redrover/page/FreestyleProjectStatusPage.java +++ b/src/test/java/school/redrover/ui/page/FreestyleProjectStatusPage.java @@ -1,11 +1,10 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; -import school.redrover.component.project.status_page.sidebar.FreestyleProjectSidebar; -import school.redrover.trait.project_sidebar.*; +import school.redrover.ui.component.project.status_page.sidebar.FreestyleProjectSidebar; public class FreestyleProjectStatusPage extends BaseProjectStatusPage { diff --git a/src/test/java/school/redrover/page/FreestyleProjectWorkspacePage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectWorkspacePage.java similarity index 86% rename from src/test/java/school/redrover/page/FreestyleProjectWorkspacePage.java rename to src/test/java/school/redrover/ui/page/FreestyleProjectWorkspacePage.java index 7a2c7ee18..abdd8a9b2 100644 --- a/src/test/java/school/redrover/page/FreestyleProjectWorkspacePage.java +++ b/src/test/java/school/redrover/ui/page/FreestyleProjectWorkspacePage.java @@ -1,9 +1,8 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/GlobalCredentialsPage.java b/src/test/java/school/redrover/ui/page/GlobalCredentialsPage.java similarity index 94% rename from src/test/java/school/redrover/page/GlobalCredentialsPage.java rename to src/test/java/school/redrover/ui/page/GlobalCredentialsPage.java index 6d5237289..c82a47319 100644 --- a/src/test/java/school/redrover/page/GlobalCredentialsPage.java +++ b/src/test/java/school/redrover/ui/page/GlobalCredentialsPage.java @@ -1,10 +1,9 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.BasePage; import java.util.List; diff --git a/src/test/java/school/redrover/page/HomePage.java b/src/test/java/school/redrover/ui/page/HomePage.java similarity index 99% rename from src/test/java/school/redrover/page/HomePage.java rename to src/test/java/school/redrover/ui/page/HomePage.java index bbccc32b0..625e82921 100644 --- a/src/test/java/school/redrover/page/HomePage.java +++ b/src/test/java/school/redrover/ui/page/HomePage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; diff --git a/src/test/java/school/redrover/page/JenkinsManagementPage.java b/src/test/java/school/redrover/ui/page/JenkinsManagementPage.java similarity index 98% rename from src/test/java/school/redrover/page/JenkinsManagementPage.java rename to src/test/java/school/redrover/ui/page/JenkinsManagementPage.java index 8c38ec5af..6f04272d8 100644 --- a/src/test/java/school/redrover/page/JenkinsManagementPage.java +++ b/src/test/java/school/redrover/ui/page/JenkinsManagementPage.java @@ -1,6 +1,5 @@ -package school.redrover.page; +package school.redrover.ui.page; -import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/LoginPage.java b/src/test/java/school/redrover/ui/page/LoginPage.java similarity index 92% rename from src/test/java/school/redrover/page/LoginPage.java rename to src/test/java/school/redrover/ui/page/LoginPage.java index 8802da7a0..591173f34 100644 --- a/src/test/java/school/redrover/page/LoginPage.java +++ b/src/test/java/school/redrover/ui/page/LoginPage.java @@ -1,9 +1,8 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/MultiBranchProjectBuildHistoryPage.java b/src/test/java/school/redrover/ui/page/MultiBranchProjectBuildHistoryPage.java similarity index 92% rename from src/test/java/school/redrover/page/MultiBranchProjectBuildHistoryPage.java rename to src/test/java/school/redrover/ui/page/MultiBranchProjectBuildHistoryPage.java index e41913f35..3e451bbac 100644 --- a/src/test/java/school/redrover/page/MultiBranchProjectBuildHistoryPage.java +++ b/src/test/java/school/redrover/ui/page/MultiBranchProjectBuildHistoryPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/MultiBranchProjectCredentialsPage.java b/src/test/java/school/redrover/ui/page/MultiBranchProjectCredentialsPage.java similarity index 91% rename from src/test/java/school/redrover/page/MultiBranchProjectCredentialsPage.java rename to src/test/java/school/redrover/ui/page/MultiBranchProjectCredentialsPage.java index 01c513adc..c96752cb3 100644 --- a/src/test/java/school/redrover/page/MultiBranchProjectCredentialsPage.java +++ b/src/test/java/school/redrover/ui/page/MultiBranchProjectCredentialsPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/MultiConfigProjectBuildNowPage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectBuildNowPage.java similarity index 91% rename from src/test/java/school/redrover/page/MultiConfigProjectBuildNowPage.java rename to src/test/java/school/redrover/ui/page/MultiConfigProjectBuildNowPage.java index 21877a47c..244d8fc27 100644 --- a/src/test/java/school/redrover/page/MultiConfigProjectBuildNowPage.java +++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectBuildNowPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/MultiConfigProjectChangesPage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectChangesPage.java similarity index 91% rename from src/test/java/school/redrover/page/MultiConfigProjectChangesPage.java rename to src/test/java/school/redrover/ui/page/MultiConfigProjectChangesPage.java index f6f8a1c4f..ccb1da9f0 100644 --- a/src/test/java/school/redrover/page/MultiConfigProjectChangesPage.java +++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectChangesPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/MultiConfigProjectConfigurationPage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectConfigurationPage.java similarity index 98% rename from src/test/java/school/redrover/page/MultiConfigProjectConfigurationPage.java rename to src/test/java/school/redrover/ui/page/MultiConfigProjectConfigurationPage.java index 2628a736b..f89952c3a 100644 --- a/src/test/java/school/redrover/page/MultiConfigProjectConfigurationPage.java +++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectConfigurationPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/MultiConfigProjectCredentialsPage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectCredentialsPage.java similarity index 91% rename from src/test/java/school/redrover/page/MultiConfigProjectCredentialsPage.java rename to src/test/java/school/redrover/ui/page/MultiConfigProjectCredentialsPage.java index 7759b4703..31f40d1ff 100644 --- a/src/test/java/school/redrover/page/MultiConfigProjectCredentialsPage.java +++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectCredentialsPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/MultiConfigProjectStatusPage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectStatusPage.java similarity index 94% rename from src/test/java/school/redrover/page/MultiConfigProjectStatusPage.java rename to src/test/java/school/redrover/ui/page/MultiConfigProjectStatusPage.java index cc13dbafa..09166d97c 100644 --- a/src/test/java/school/redrover/page/MultiConfigProjectStatusPage.java +++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectStatusPage.java @@ -1,9 +1,9 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import school.redrover.component.project.status_page.sidebar.MultiConfigProjectSidebar; +import school.redrover.ui.component.project.status_page.sidebar.MultiConfigProjectSidebar; public class MultiConfigProjectStatusPage extends BaseProjectStatusPage { diff --git a/src/test/java/school/redrover/page/MultiConfigProjectWorkspacePage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectWorkspacePage.java similarity index 91% rename from src/test/java/school/redrover/page/MultiConfigProjectWorkspacePage.java rename to src/test/java/school/redrover/ui/page/MultiConfigProjectWorkspacePage.java index 73862b626..aa8ef5647 100644 --- a/src/test/java/school/redrover/page/MultiConfigProjectWorkspacePage.java +++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectWorkspacePage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/MultibranchProjectConfigurationPage.java b/src/test/java/school/redrover/ui/page/MultibranchProjectConfigurationPage.java similarity index 98% rename from src/test/java/school/redrover/page/MultibranchProjectConfigurationPage.java rename to src/test/java/school/redrover/ui/page/MultibranchProjectConfigurationPage.java index 2e7857b73..963cffc08 100644 --- a/src/test/java/school/redrover/page/MultibranchProjectConfigurationPage.java +++ b/src/test/java/school/redrover/ui/page/MultibranchProjectConfigurationPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/MultibranchProjectStatusPage.java b/src/test/java/school/redrover/ui/page/MultibranchProjectStatusPage.java similarity index 94% rename from src/test/java/school/redrover/page/MultibranchProjectStatusPage.java rename to src/test/java/school/redrover/ui/page/MultibranchProjectStatusPage.java index fd2421325..d9c44413a 100644 --- a/src/test/java/school/redrover/page/MultibranchProjectStatusPage.java +++ b/src/test/java/school/redrover/ui/page/MultibranchProjectStatusPage.java @@ -1,11 +1,11 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; -import school.redrover.component.project.status_page.sidebar.MultiBranchProjectSidebar; +import school.redrover.ui.component.project.status_page.sidebar.MultiBranchProjectSidebar; public class MultibranchProjectStatusPage extends BaseProjectStatusPage { diff --git a/src/test/java/school/redrover/page/NewCredentialsPage.java b/src/test/java/school/redrover/ui/page/NewCredentialsPage.java similarity index 97% rename from src/test/java/school/redrover/page/NewCredentialsPage.java rename to src/test/java/school/redrover/ui/page/NewCredentialsPage.java index 991f017dd..5607ffee4 100644 --- a/src/test/java/school/redrover/page/NewCredentialsPage.java +++ b/src/test/java/school/redrover/ui/page/NewCredentialsPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/NewItemPage.java b/src/test/java/school/redrover/ui/page/NewItemPage.java similarity index 99% rename from src/test/java/school/redrover/page/NewItemPage.java rename to src/test/java/school/redrover/ui/page/NewItemPage.java index 3303d6c62..21ac01f25 100644 --- a/src/test/java/school/redrover/page/NewItemPage.java +++ b/src/test/java/school/redrover/ui/page/NewItemPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/NewNodePage.java b/src/test/java/school/redrover/ui/page/NewNodePage.java similarity index 97% rename from src/test/java/school/redrover/page/NewNodePage.java rename to src/test/java/school/redrover/ui/page/NewNodePage.java index 1bf142ae0..06248a0fb 100644 --- a/src/test/java/school/redrover/page/NewNodePage.java +++ b/src/test/java/school/redrover/ui/page/NewNodePage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/NodesPage.java b/src/test/java/school/redrover/ui/page/NodesPage.java similarity index 99% rename from src/test/java/school/redrover/page/NodesPage.java rename to src/test/java/school/redrover/ui/page/NodesPage.java index 4d09ccbe1..d5671649f 100644 --- a/src/test/java/school/redrover/page/NodesPage.java +++ b/src/test/java/school/redrover/ui/page/NodesPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; diff --git a/src/test/java/school/redrover/page/OrganizationFolderBuildHistoryPage.java b/src/test/java/school/redrover/ui/page/OrganizationFolderBuildHistoryPage.java similarity index 92% rename from src/test/java/school/redrover/page/OrganizationFolderBuildHistoryPage.java rename to src/test/java/school/redrover/ui/page/OrganizationFolderBuildHistoryPage.java index f9a8ff30d..fd85b7376 100644 --- a/src/test/java/school/redrover/page/OrganizationFolderBuildHistoryPage.java +++ b/src/test/java/school/redrover/ui/page/OrganizationFolderBuildHistoryPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/OrganizationFolderConfigurationPage.java b/src/test/java/school/redrover/ui/page/OrganizationFolderConfigurationPage.java similarity index 98% rename from src/test/java/school/redrover/page/OrganizationFolderConfigurationPage.java rename to src/test/java/school/redrover/ui/page/OrganizationFolderConfigurationPage.java index 1eac3f72d..415031c56 100644 --- a/src/test/java/school/redrover/page/OrganizationFolderConfigurationPage.java +++ b/src/test/java/school/redrover/ui/page/OrganizationFolderConfigurationPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/OrganizationFolderCredentialsPage.java b/src/test/java/school/redrover/ui/page/OrganizationFolderCredentialsPage.java similarity index 91% rename from src/test/java/school/redrover/page/OrganizationFolderCredentialsPage.java rename to src/test/java/school/redrover/ui/page/OrganizationFolderCredentialsPage.java index dd754957a..4a19afa01 100644 --- a/src/test/java/school/redrover/page/OrganizationFolderCredentialsPage.java +++ b/src/test/java/school/redrover/ui/page/OrganizationFolderCredentialsPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/OrganizationFolderStatusPage.java b/src/test/java/school/redrover/ui/page/OrganizationFolderStatusPage.java similarity index 91% rename from src/test/java/school/redrover/page/OrganizationFolderStatusPage.java rename to src/test/java/school/redrover/ui/page/OrganizationFolderStatusPage.java index 0568aabd8..5171688f6 100644 --- a/src/test/java/school/redrover/page/OrganizationFolderStatusPage.java +++ b/src/test/java/school/redrover/ui/page/OrganizationFolderStatusPage.java @@ -1,9 +1,9 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import school.redrover.component.project.status_page.sidebar.OrganizationFolderSidebar; +import school.redrover.ui.component.project.status_page.sidebar.OrganizationFolderSidebar; public class OrganizationFolderStatusPage extends BaseProjectStatusPage { diff --git a/src/test/java/school/redrover/page/PipelineProjectBuildNowPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectBuildNowPage.java similarity index 91% rename from src/test/java/school/redrover/page/PipelineProjectBuildNowPage.java rename to src/test/java/school/redrover/ui/page/PipelineProjectBuildNowPage.java index 4421f0f91..3558810e7 100644 --- a/src/test/java/school/redrover/page/PipelineProjectBuildNowPage.java +++ b/src/test/java/school/redrover/ui/page/PipelineProjectBuildNowPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/PipelineProjectChangesPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectChangesPage.java similarity index 91% rename from src/test/java/school/redrover/page/PipelineProjectChangesPage.java rename to src/test/java/school/redrover/ui/page/PipelineProjectChangesPage.java index 6898a25e3..f1ee47bda 100644 --- a/src/test/java/school/redrover/page/PipelineProjectChangesPage.java +++ b/src/test/java/school/redrover/ui/page/PipelineProjectChangesPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/PipelineProjectConfigurationPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectConfigurationPage.java similarity index 99% rename from src/test/java/school/redrover/page/PipelineProjectConfigurationPage.java rename to src/test/java/school/redrover/ui/page/PipelineProjectConfigurationPage.java index b2b8f47b9..b8c9682e5 100644 --- a/src/test/java/school/redrover/page/PipelineProjectConfigurationPage.java +++ b/src/test/java/school/redrover/ui/page/PipelineProjectConfigurationPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; diff --git a/src/test/java/school/redrover/page/PipelineProjectCredentialsPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectCredentialsPage.java similarity index 91% rename from src/test/java/school/redrover/page/PipelineProjectCredentialsPage.java rename to src/test/java/school/redrover/ui/page/PipelineProjectCredentialsPage.java index f83ca2415..01081f58f 100644 --- a/src/test/java/school/redrover/page/PipelineProjectCredentialsPage.java +++ b/src/test/java/school/redrover/ui/page/PipelineProjectCredentialsPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/PipelineProjectHistoryConsolePage.java b/src/test/java/school/redrover/ui/page/PipelineProjectHistoryConsolePage.java similarity index 94% rename from src/test/java/school/redrover/page/PipelineProjectHistoryConsolePage.java rename to src/test/java/school/redrover/ui/page/PipelineProjectHistoryConsolePage.java index ad2becde6..62d86707a 100644 --- a/src/test/java/school/redrover/page/PipelineProjectHistoryConsolePage.java +++ b/src/test/java/school/redrover/ui/page/PipelineProjectHistoryConsolePage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/PipelineProjectHistoryPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectHistoryPage.java similarity index 95% rename from src/test/java/school/redrover/page/PipelineProjectHistoryPage.java rename to src/test/java/school/redrover/ui/page/PipelineProjectHistoryPage.java index a29627aa5..d76a063b2 100644 --- a/src/test/java/school/redrover/page/PipelineProjectHistoryPage.java +++ b/src/test/java/school/redrover/ui/page/PipelineProjectHistoryPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/PipelineProjectStatusPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectStatusPage.java similarity index 96% rename from src/test/java/school/redrover/page/PipelineProjectStatusPage.java rename to src/test/java/school/redrover/ui/page/PipelineProjectStatusPage.java index beb066dc4..372e9712a 100644 --- a/src/test/java/school/redrover/page/PipelineProjectStatusPage.java +++ b/src/test/java/school/redrover/ui/page/PipelineProjectStatusPage.java @@ -1,11 +1,11 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; -import school.redrover.component.project.status_page.sidebar.PipelineProjectSidebar; +import school.redrover.ui.component.project.status_page.sidebar.PipelineProjectSidebar; import java.util.List; diff --git a/src/test/java/school/redrover/page/PipelineProjectSyntaxPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectSyntaxPage.java similarity index 95% rename from src/test/java/school/redrover/page/PipelineProjectSyntaxPage.java rename to src/test/java/school/redrover/ui/page/PipelineProjectSyntaxPage.java index aebbcd5a3..9f0661357 100644 --- a/src/test/java/school/redrover/page/PipelineProjectSyntaxPage.java +++ b/src/test/java/school/redrover/ui/page/PipelineProjectSyntaxPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/ProjectMovePage.java b/src/test/java/school/redrover/ui/page/ProjectMovePage.java similarity index 97% rename from src/test/java/school/redrover/page/ProjectMovePage.java rename to src/test/java/school/redrover/ui/page/ProjectMovePage.java index 87c772293..129386246 100644 --- a/src/test/java/school/redrover/page/ProjectMovePage.java +++ b/src/test/java/school/redrover/ui/page/ProjectMovePage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/ProjectRenamingPage.java b/src/test/java/school/redrover/ui/page/ProjectRenamingPage.java similarity index 97% rename from src/test/java/school/redrover/page/ProjectRenamingPage.java rename to src/test/java/school/redrover/ui/page/ProjectRenamingPage.java index 6ad4d041a..20e2c4cd0 100644 --- a/src/test/java/school/redrover/page/ProjectRenamingPage.java +++ b/src/test/java/school/redrover/ui/page/ProjectRenamingPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/RestApiPage.java b/src/test/java/school/redrover/ui/page/RestApiPage.java similarity index 95% rename from src/test/java/school/redrover/page/RestApiPage.java rename to src/test/java/school/redrover/ui/page/RestApiPage.java index 63199be1e..b36e32a06 100644 --- a/src/test/java/school/redrover/page/RestApiPage.java +++ b/src/test/java/school/redrover/ui/page/RestApiPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/school/redrover/page/SystemConfigurationPage.java b/src/test/java/school/redrover/ui/page/SystemConfigurationPage.java similarity index 99% rename from src/test/java/school/redrover/page/SystemConfigurationPage.java rename to src/test/java/school/redrover/ui/page/SystemConfigurationPage.java index 920b6a3d5..b8ea475b0 100644 --- a/src/test/java/school/redrover/page/SystemConfigurationPage.java +++ b/src/test/java/school/redrover/ui/page/SystemConfigurationPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.*; import org.openqa.selenium.interactions.Actions; diff --git a/src/test/java/school/redrover/page/UserAccountPage.java b/src/test/java/school/redrover/ui/page/UserAccountPage.java similarity index 94% rename from src/test/java/school/redrover/page/UserAccountPage.java rename to src/test/java/school/redrover/ui/page/UserAccountPage.java index effdfba07..9f6cef95e 100644 --- a/src/test/java/school/redrover/page/UserAccountPage.java +++ b/src/test/java/school/redrover/ui/page/UserAccountPage.java @@ -1,9 +1,8 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.BasePage; diff --git a/src/test/java/school/redrover/page/UserCreatingPage.java b/src/test/java/school/redrover/ui/page/UserCreatingPage.java similarity index 95% rename from src/test/java/school/redrover/page/UserCreatingPage.java rename to src/test/java/school/redrover/ui/page/UserCreatingPage.java index ed3fb964e..8f682f74c 100644 --- a/src/test/java/school/redrover/page/UserCreatingPage.java +++ b/src/test/java/school/redrover/ui/page/UserCreatingPage.java @@ -1,9 +1,8 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.ui.ExpectedConditions; import school.redrover.common.BasePage; import java.util.List; diff --git a/src/test/java/school/redrover/page/UserStatusPage.java b/src/test/java/school/redrover/ui/page/UserStatusPage.java similarity index 98% rename from src/test/java/school/redrover/page/UserStatusPage.java rename to src/test/java/school/redrover/ui/page/UserStatusPage.java index ece5b1893..13b506b23 100644 --- a/src/test/java/school/redrover/page/UserStatusPage.java +++ b/src/test/java/school/redrover/ui/page/UserStatusPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; diff --git a/src/test/java/school/redrover/page/UsersPage.java b/src/test/java/school/redrover/ui/page/UsersPage.java similarity index 98% rename from src/test/java/school/redrover/page/UsersPage.java rename to src/test/java/school/redrover/ui/page/UsersPage.java index 9229e97a3..e78bad3fa 100644 --- a/src/test/java/school/redrover/page/UsersPage.java +++ b/src/test/java/school/redrover/ui/page/UsersPage.java @@ -1,4 +1,4 @@ -package school.redrover.page; +package school.redrover.ui.page; import org.openqa.selenium.By; import org.openqa.selenium.Keys; diff --git a/src/test/java/school/redrover/trait/BaseTrait.java b/src/test/java/school/redrover/ui/trait/BaseTrait.java similarity index 87% rename from src/test/java/school/redrover/trait/BaseTrait.java rename to src/test/java/school/redrover/ui/trait/BaseTrait.java index 5b7728168..5d9eae4c6 100644 --- a/src/test/java/school/redrover/trait/BaseTrait.java +++ b/src/test/java/school/redrover/ui/trait/BaseTrait.java @@ -1,4 +1,4 @@ -package school.redrover.trait; +package school.redrover.ui.trait; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.WebDriverWait; diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarBuildHistoryTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildHistoryTrait.java similarity index 84% rename from src/test/java/school/redrover/trait/project_sidebar/SidebarBuildHistoryTrait.java rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildHistoryTrait.java index 38fc9a88c..18336ec30 100644 --- a/src/test/java/school/redrover/trait/project_sidebar/SidebarBuildHistoryTrait.java +++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildHistoryTrait.java @@ -1,9 +1,9 @@ -package school.redrover.trait.project_sidebar; +package school.redrover.ui.trait.project_sidebar; import org.openqa.selenium.By; import school.redrover.common.BasePage; -import school.redrover.trait.BaseTrait; +import school.redrover.ui.trait.BaseTrait; public interface SidebarBuildHistoryTrait> diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarBuildNowTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildNowTrait.java similarity index 82% rename from src/test/java/school/redrover/trait/project_sidebar/SidebarBuildNowTrait.java rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildNowTrait.java index 821da19f3..209d76fea 100644 --- a/src/test/java/school/redrover/trait/project_sidebar/SidebarBuildNowTrait.java +++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildNowTrait.java @@ -1,9 +1,9 @@ -package school.redrover.trait.project_sidebar; +package school.redrover.ui.trait.project_sidebar; import org.openqa.selenium.By; import school.redrover.common.BasePage; -import school.redrover.trait.BaseTrait; +import school.redrover.ui.trait.BaseTrait; public interface SidebarBuildNowTrait> diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarChangesTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarChangesTrait.java similarity index 82% rename from src/test/java/school/redrover/trait/project_sidebar/SidebarChangesTrait.java rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarChangesTrait.java index c62dbcc3f..28e2e1a43 100644 --- a/src/test/java/school/redrover/trait/project_sidebar/SidebarChangesTrait.java +++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarChangesTrait.java @@ -1,9 +1,9 @@ -package school.redrover.trait.project_sidebar; +package school.redrover.ui.trait.project_sidebar; import org.openqa.selenium.By; import school.redrover.common.BasePage; -import school.redrover.trait.BaseTrait; +import school.redrover.ui.trait.BaseTrait; public interface SidebarChangesTrait> extends BaseTrait { diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarCredentialsTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarCredentialsTrait.java similarity index 83% rename from src/test/java/school/redrover/trait/project_sidebar/SidebarCredentialsTrait.java rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarCredentialsTrait.java index ee35cf470..56f899018 100644 --- a/src/test/java/school/redrover/trait/project_sidebar/SidebarCredentialsTrait.java +++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarCredentialsTrait.java @@ -1,9 +1,9 @@ -package school.redrover.trait.project_sidebar; +package school.redrover.ui.trait.project_sidebar; import org.openqa.selenium.By; import school.redrover.common.BasePage; -import school.redrover.trait.BaseTrait; +import school.redrover.ui.trait.BaseTrait; public interface SidebarCredentialsTrait> extends BaseTrait { diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarWorkspaceTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarWorkspaceTrait.java similarity index 83% rename from src/test/java/school/redrover/trait/project_sidebar/SidebarWorkspaceTrait.java rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarWorkspaceTrait.java index 81d303ace..dbcf0698b 100644 --- a/src/test/java/school/redrover/trait/project_sidebar/SidebarWorkspaceTrait.java +++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarWorkspaceTrait.java @@ -1,9 +1,9 @@ -package school.redrover.trait.project_sidebar; +package school.redrover.ui.trait.project_sidebar; import org.openqa.selenium.By; import school.redrover.common.BasePage; -import school.redrover.trait.BaseTrait; +import school.redrover.ui.trait.BaseTrait; public interface SidebarWorkspaceTrait> extends BaseTrait { From 11b5a48954a4076cc3b5415a45e4be0c34cd06fd Mon Sep 17 00:00:00 2001 From: Stanislav Agafonov Date: Sat, 31 Jan 2026 09:38:32 +0300 Subject: [PATCH 08/14] API test > APIJenkinsTest > testCreateAndDeleteFolder --- .../redrover/api/APIFreestyleProjectTest.java | 2 +- .../school/redrover/api/APIJenkinsTest.java | 68 +++++++++++++++---- 2 files changed, 54 insertions(+), 16 deletions(-) diff --git a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java index d2237eb5b..43f42b7f3 100644 --- a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java +++ b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java @@ -43,7 +43,7 @@ public void testCreateWithValidName() { .baseUri(jenkinsUrl) .contentType(ContentType.XML) .queryParams(projectName) - .body(bodyFreestyleProjectXML) + .body(bodyXML) .when() .post("/createItem") .then() diff --git a/src/test/java/school/redrover/api/APIJenkinsTest.java b/src/test/java/school/redrover/api/APIJenkinsTest.java index 198006564..611d61d17 100644 --- a/src/test/java/school/redrover/api/APIJenkinsTest.java +++ b/src/test/java/school/redrover/api/APIJenkinsTest.java @@ -12,21 +12,6 @@ public class APIJenkinsTest extends APIBaseTest { - @Test - public void jenkinsTest() { - RestAssured.given() - .log().all()// ← добавил что бы смотреть, что отправляю и что получаю(в конце лог) - .when() - .auth() - .preemptive() - .basic(userName, apiToken) - .when() - .get(jenkinsUrl + "api/json") - .then() - .log().all() - .statusCode(200); - } - @Test public void testCreatePiplineAndDisable() { Map projectName = new HashMap<>(); @@ -81,4 +66,57 @@ public void testCreatePiplineAndDisable() { Assert.assertEquals(getResponse.getStatusCode(), 200); Assert.assertTrue(responseBody.contains("This project is currently disabled")); } + + @Test + public void testCreateAndDeleteFolder() { + String folderName = "ApiTestFolder"; + + String folderConfigXml = """ + + Created via CloudBees Folder Plugin API + + """; + + RestAssured.given() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .contentType(ContentType.XML) + .queryParam("name", folderName) + .body(folderConfigXml) + .when() + .post("/createItem") + .then() + .statusCode(200); + + Response getResponse = RestAssured.given() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .get("job/%s/api/json".formatted(folderName)) + .then() + .extract().response(); + + Assert.assertEquals(getResponse.statusCode(), 200); + Assert.assertEquals(getResponse.jsonPath().getString("name"), folderName); + + RestAssured.given() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .post("job/%s/doDelete".formatted(folderName)) + .then() + .statusCode(302); + + Response deletedResponse = RestAssured.given() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .get("job/%s/api/json".formatted(folderName)) + .then() + .extract().response(); + + Assert.assertEquals(deletedResponse.statusCode(), 404, + "Expected 404 after deletion, but got " + deletedResponse.statusCode()); + } + } From b7b3b91f40e601518714af86fa75e0eadab6de23 Mon Sep 17 00:00:00 2001 From: Marin4kin Date: Fri, 30 Jan 2026 23:18:45 +0300 Subject: [PATCH 09/14] new testCreateUser --- .../redrover/api/APIFreestyleProjectTest.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java index 43f42b7f3..87e565a18 100644 --- a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java +++ b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java @@ -112,4 +112,43 @@ public void testRenameProject() { Assert.assertEquals(actualProjectName, NEW_PROJECT_NAME); } + @Test + public void testCreateUser() { + Map userForm = new HashMap<>(); + userForm.put("username", "UserUser" ); + userForm.put("password1", "passwordUser"); + userForm.put("password2", "passwordUser"); + userForm.put("fullname", "UserUserName"); + userForm.put("email", "user@user.us"); + + Response response = RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .contentType(ContentType.XML) + .queryParams(userForm) + .when() + .post("securityRealm/createAccountByAdmin") + .then() + .log().all() + .extract().response(); + + String location = response.getHeader("Location"); + + Response getResponse = RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .get("%s".formatted(location)) + .then() + .log().all() + .extract().response(); + + String responseBody = getResponse.getBody().asString(); + + Assert.assertEquals(response.getStatusCode(), 302); + Assert.assertEquals(getResponse.getStatusCode(), 200); + Assert.assertTrue(responseBody.contains(userForm.get("username"))); + } } From bf1e6212c1cd1520727083387cc9f4f9b1dd8e21 Mon Sep 17 00:00:00 2001 From: Marin4kin Date: Fri, 30 Jan 2026 23:21:39 +0300 Subject: [PATCH 10/14] new testCreateUser --- src/test/java/school/redrover/api/APIFreestyleProjectTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java index 87e565a18..159283d3d 100644 --- a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java +++ b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java @@ -115,7 +115,7 @@ public void testRenameProject() { @Test public void testCreateUser() { Map userForm = new HashMap<>(); - userForm.put("username", "UserUser" ); + userForm.put("username", "UserUser"); userForm.put("password1", "passwordUser"); userForm.put("password2", "passwordUser"); userForm.put("fullname", "UserUserName"); From 9e0d26bfa55db641f66c7e1899e4125395d90272 Mon Sep 17 00:00:00 2001 From: Marin4kin Date: Fri, 30 Jan 2026 23:23:24 +0300 Subject: [PATCH 11/14] new testCreateUser --- .../redrover/api/APIFreestyleProjectTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java index 159283d3d..b54c5faab 100644 --- a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java +++ b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java @@ -114,19 +114,19 @@ public void testRenameProject() { @Test public void testCreateUser() { - Map userForm = new HashMap<>(); - userForm.put("username", "UserUser"); - userForm.put("password1", "passwordUser"); - userForm.put("password2", "passwordUser"); - userForm.put("fullname", "UserUserName"); - userForm.put("email", "user@user.us"); + Map userData = new HashMap<>(); + userData.put("username", "UserUser"); + userData.put("password1", "passwordUser"); + userData.put("password2", "passwordUser"); + userData.put("fullname", "UserUserName"); + userData.put("email", "user@user.us"); Response response = RestAssured.given() .log().all() .auth().preemptive().basic(userName, apiToken) .baseUri(jenkinsUrl) .contentType(ContentType.XML) - .queryParams(userForm) + .queryParams(userData) .when() .post("securityRealm/createAccountByAdmin") .then() @@ -149,6 +149,6 @@ public void testCreateUser() { Assert.assertEquals(response.getStatusCode(), 302); Assert.assertEquals(getResponse.getStatusCode(), 200); - Assert.assertTrue(responseBody.contains(userForm.get("username"))); + Assert.assertTrue(responseBody.contains(userData.get("username"))); } } From c5211a258f95a39d9abfe5b811bbe25615ce69b1 Mon Sep 17 00:00:00 2001 From: Marin4kin Date: Fri, 30 Jan 2026 23:40:29 +0300 Subject: [PATCH 12/14] new testCreateUser --- src/test/java/school/redrover/api/APIFreestyleProjectTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java index b54c5faab..fbd6271e4 100644 --- a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java +++ b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java @@ -125,7 +125,6 @@ public void testCreateUser() { .log().all() .auth().preemptive().basic(userName, apiToken) .baseUri(jenkinsUrl) - .contentType(ContentType.XML) .queryParams(userData) .when() .post("securityRealm/createAccountByAdmin") From a79a7d53f1c9026aa0f9de22c335c32ae591cab7 Mon Sep 17 00:00:00 2001 From: Marin4kin Date: Sat, 31 Jan 2026 13:57:32 +0300 Subject: [PATCH 13/14] new testCreateUser --- src/test/java/school/redrover/api/APIJenkinsTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/school/redrover/api/APIJenkinsTest.java b/src/test/java/school/redrover/api/APIJenkinsTest.java index 611d61d17..f1ac0ed6f 100644 --- a/src/test/java/school/redrover/api/APIJenkinsTest.java +++ b/src/test/java/school/redrover/api/APIJenkinsTest.java @@ -118,5 +118,4 @@ public void testCreateAndDeleteFolder() { Assert.assertEquals(deletedResponse.statusCode(), 404, "Expected 404 after deletion, but got " + deletedResponse.statusCode()); } - } From 64ad83c5f33f2e70d0e865ae6e367f804664789f Mon Sep 17 00:00:00 2001 From: Marin4kin Date: Sat, 31 Jan 2026 14:00:24 +0300 Subject: [PATCH 14/14] new testCreateUser --- .../redrover/api/APIFreestyleProjectTest.java | 78 ------------------- .../school/redrover/api/APIJenkinsTest.java | 39 ++++++++++ 2 files changed, 39 insertions(+), 78 deletions(-) diff --git a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java index 0cb36595d..15cf0e3fa 100644 --- a/src/test/java/school/redrover/api/APIFreestyleProjectTest.java +++ b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java @@ -111,82 +111,4 @@ public void testRenameProject() { String actualProjectName = response.jsonPath().getString("name"); Assert.assertEquals(actualProjectName, NEW_PROJECT_NAME); } - - @Test - public void testCreateUser() { - Map userData = new HashMap<>(); - userData.put("username", "UserUser"); - userData.put("password1", "passwordUser"); - userData.put("password2", "passwordUser"); - userData.put("fullname", "UserUserName"); - userData.put("email", "user@user.us"); - - Response response = RestAssured.given() - .log().all() - .auth().preemptive().basic(userName, apiToken) - .baseUri(jenkinsUrl) - .queryParams(userData) - .when() - .post("securityRealm/createAccountByAdmin") - .then() - .log().all() - .extract().response(); - - String location = response.getHeader("Location"); - - Response getResponse = RestAssured.given() - .log().all() - .auth().preemptive().basic(userName, apiToken) - .baseUri(jenkinsUrl) - .when() - .get("%s".formatted(location)) - .then() - .log().all() - .extract().response(); - - String responseBody = getResponse.getBody().asString(); - - Assert.assertEquals(response.getStatusCode(), 302); - Assert.assertEquals(getResponse.getStatusCode(), 200); - Assert.assertTrue(responseBody.contains(userData.get("username"))); - } - - @Test - public void testCreateUser() { - Map userData = new HashMap<>(); - userData.put("username", "UserUser"); - userData.put("password1", "passwordUser"); - userData.put("password2", "passwordUser"); - userData.put("fullname", "UserUserName"); - userData.put("email", "user@user.us"); - - Response response = RestAssured.given() - .log().all() - .auth().preemptive().basic(userName, apiToken) - .baseUri(jenkinsUrl) - .queryParams(userData) - .when() - .post("securityRealm/createAccountByAdmin") - .then() - .log().all() - .extract().response(); - - String location = response.getHeader("Location"); - - Response getResponse = RestAssured.given() - .log().all() - .auth().preemptive().basic(userName, apiToken) - .baseUri(jenkinsUrl) - .when() - .get("%s".formatted(location)) - .then() - .log().all() - .extract().response(); - - String responseBody = getResponse.getBody().asString(); - - Assert.assertEquals(response.getStatusCode(), 302); - Assert.assertEquals(getResponse.getStatusCode(), 200); - Assert.assertTrue(responseBody.contains(userData.get("username"))); - } } diff --git a/src/test/java/school/redrover/api/APIJenkinsTest.java b/src/test/java/school/redrover/api/APIJenkinsTest.java index f1ac0ed6f..ef61037cf 100644 --- a/src/test/java/school/redrover/api/APIJenkinsTest.java +++ b/src/test/java/school/redrover/api/APIJenkinsTest.java @@ -118,4 +118,43 @@ public void testCreateAndDeleteFolder() { Assert.assertEquals(deletedResponse.statusCode(), 404, "Expected 404 after deletion, but got " + deletedResponse.statusCode()); } + + @Test + public void testCreateUser() { + Map userData = new HashMap<>(); + userData.put("username", "UserUser"); + userData.put("password1", "passwordUser"); + userData.put("password2", "passwordUser"); + userData.put("fullname", "UserUserName"); + userData.put("email", "user@user.us"); + + Response response = RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .queryParams(userData) + .when() + .post("securityRealm/createAccountByAdmin") + .then() + .log().all() + .extract().response(); + + String location = response.getHeader("Location"); + + Response getResponse = RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .get("%s".formatted(location)) + .then() + .log().all() + .extract().response(); + + String responseBody = getResponse.getBody().asString(); + + Assert.assertEquals(response.getStatusCode(), 302); + Assert.assertEquals(getResponse.getStatusCode(), 200); + Assert.assertTrue(responseBody.contains(userData.get("username"))); + } }