From 63489ba988601c6a6dbf00a031f16f2a46a041b4 Mon Sep 17 00:00:00 2001 From: tstyev Date: Fri, 30 Jan 2026 23:14:52 +0300 Subject: [PATCH 1/6] API | Rename Freestyle Project #1921 --- .../redrover/APIFreestyleProjectTest.java | 115 ++++++++++++++++++ .../java/school/redrover/APIJenkinsTest.java | 53 -------- 2 files changed, 115 insertions(+), 53 deletions(-) create mode 100644 src/test/java/school/redrover/APIFreestyleProjectTest.java diff --git a/src/test/java/school/redrover/APIFreestyleProjectTest.java b/src/test/java/school/redrover/APIFreestyleProjectTest.java new file mode 100644 index 000000000..54f48b501 --- /dev/null +++ b/src/test/java/school/redrover/APIFreestyleProjectTest.java @@ -0,0 +1,115 @@ +package school.redrover; + +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 APIFreestyleProjectTest extends APIBaseTest { + + private static final String PROJECT_NAME = "FreestyleProject"; + private static final String NEW_PROJECT_NAME = "NewFreestyleProject"; + + private static final String bodyXML = """ + + false + + + false + false + false + false + + false + + + + + """; + + @Test + public void testCreateWithValidName() { + Map projectName = new HashMap<>(); + projectName.put("name", PROJECT_NAME); + + RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .contentType(ContentType.XML) + .queryParams(projectName) + .body(bodyXML) + .when() + .post("/createItem") + .then() + .log().all() + .statusCode(200); + + Response response = RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .get("job/%s/api/json".formatted(projectName.get("name"))) + .then() + .log().all() + .extract().response(); + + String actualProjectName = response.jsonPath().getString("name"); + Assert.assertEquals(actualProjectName, projectName.get("name")); + + Integer statusCode = response.getStatusCode(); + Assert.assertEquals(statusCode, 200); + } + + @Test + public void testRenameProject() { + Map projectName = new HashMap<>(); + projectName.put("name", PROJECT_NAME); + + RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .contentType(ContentType.XML) + .queryParams(projectName) + .body(bodyXML) + .when() + .post("/createItem") + .then() + .log().all() + .statusCode(200); + + 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/confirmRename".formatted(projectName.get("name"))) + .then() + .log().all() + .statusCode(302); + + Response response = RestAssured.given() + .log().all() + .auth().preemptive().basic(userName, apiToken) + .baseUri(jenkinsUrl) + .when() + .get("job/%s/api/json".formatted(NEW_PROJECT_NAME)) + .then() + .log().all() + .statusCode(200) + .extract().response(); + + String actualProjectName = response.jsonPath().getString("name"); + Assert.assertEquals(actualProjectName, NEW_PROJECT_NAME); + } + +} diff --git a/src/test/java/school/redrover/APIJenkinsTest.java b/src/test/java/school/redrover/APIJenkinsTest.java index 16c984c2a..aed5b1c85 100644 --- a/src/test/java/school/redrover/APIJenkinsTest.java +++ b/src/test/java/school/redrover/APIJenkinsTest.java @@ -3,7 +3,6 @@ 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; @@ -28,58 +27,6 @@ public void jenkinsTest() { .statusCode(200); } - @Test - public void testCreateFreestyleProjectWithValidName() { - Map projectName = new HashMap<>(); - projectName.put("name", "FreestyleProjectName"); - - String bodyFreestyleProjectXML = """ - - false - - - false - false - false - false - - false - - - - - """; - - RestAssured.given() - .log().all() - .auth().preemptive().basic(userName, apiToken) - .baseUri(jenkinsUrl) - .contentType(ContentType.XML) - .queryParams(projectName) - .body(bodyFreestyleProjectXML) - .when() - .post("/createItem") - .then() - .log().all() - .statusCode(200); - - Response response = RestAssured.given() - .log().all() - .auth().preemptive().basic(userName, apiToken) - .baseUri(jenkinsUrl) - .when() - .get("job/%s/api/json".formatted(projectName.get("name"))) - .then() - .log().all() - .extract().response(); - - String actualProjectName = response.jsonPath().getString("name"); - Assert.assertEquals(actualProjectName, projectName.get("name")); - - Integer statusCode = response.getStatusCode(); - Assert.assertEquals(statusCode, 200); - } - @Test public void testCreatePiplineAndDisable() { Map projectName = new HashMap<>(); From 6c7c12d6e516d9fec71c376fc83886548af52510 Mon Sep 17 00:00:00 2001 From: tstyev Date: Fri, 30 Jan 2026 23:38:37 +0300 Subject: [PATCH 2/6] API | Rename Freestyle Project #1921 --- .../{ => api}/APIFreestyleProjectTest.java | 2 +- .../school/redrover/{ => api}/APIJenkinsTest.java | 2 +- .../java/school/redrover/{ => api}/APITest.java | 3 +-- src/test/java/school/redrover/common/BasePage.java | 14 +++++++------- .../java/school/redrover/common/CucumberTest.java | 2 +- .../redrover/common/filter/FilterForTestsTest.java | 10 +++++----- .../redrover/{ => ui}/BreadcrumbsDropDownTest.java | 6 +++--- .../redrover/{ => ui}/BuildHistoryAccessTest.java | 6 +++--- .../redrover/{ => ui}/ConfigurationMatrixTest.java | 6 +++--- .../redrover/{ => ui}/ConfigureAppearanceTest.java | 4 ++-- .../redrover/{ => ui}/ConfigureSystemTest.java | 4 ++-- .../school/redrover/{ => ui}/CopyFieldTest.java | 4 ++-- .../redrover/{ => ui}/CreateNewItemTest.java | 8 ++++---- .../school/redrover/{ => ui}/CredentialsTest.java | 4 ++-- .../school/redrover/{ => ui}/DashboardTest.java | 4 ++-- .../school/redrover/{ => ui}/DescriptionTest.java | 4 ++-- .../redrover/{ => ui}/FolderConfigurationTest.java | 4 ++-- .../redrover/{ => ui}/FolderManagementTest.java | 4 ++-- .../redrover/{ => ui}/FolderSettingsTest.java | 6 +++--- .../java/school/redrover/{ => ui}/FolderTest.java | 7 +++---- .../java/school/redrover/{ => ui}/FooterTest.java | 4 ++-- .../redrover/{ => ui}/FreestyleProjectTest.java | 8 ++++---- .../java/school/redrover/{ => ui}/HeaderTest.java | 6 +++--- .../redrover/{ => ui}/JenkinsManagementTest.java | 4 ++-- .../{ => ui}/MultiConfigurationProjectTest.java | 4 ++-- .../redrover/{ => ui}/MultibranchPipelineTest.java | 6 +++--- .../redrover/{ => ui}/NavigateToDashboardTest.java | 4 ++-- .../java/school/redrover/{ => ui}/NodeTest.java | 4 ++-- .../OrganizationFolderConfigurationTest.java | 6 +++--- .../redrover/{ => ui}/OrganizationFolderTest.java | 6 +++--- .../{ => ui}/PipelineBuildTriggersTest.java | 4 ++-- .../{ => ui}/PipelineConfigurationTest.java | 8 ++++---- .../school/redrover/{ => ui}/PipelineTest.java | 8 ++++---- .../school/redrover/{ => ui}/SignInOutTest.java | 6 +++--- .../school/redrover/{ => ui}/StatusAdminTest.java | 4 ++-- .../school/redrover/{ => ui}/UserLoggedInTest.java | 4 ++-- .../java/school/redrover/{ => ui}/UserTest.java | 4 ++-- .../redrover/{ => ui}/component/BaseComponent.java | 2 +- .../common/JenkinsVersionFooterDropdown.java | 4 ++-- .../{ => ui}/component/common/SearchComponent.java | 8 ++++---- .../component/common/UserAccountIconDropdown.java | 8 ++++---- .../status_page/sidebar/BaseSidebarComponent.java | 10 +++++----- .../project/status_page/sidebar/FolderSidebar.java | 8 ++++---- .../sidebar/FreestyleProjectSidebar.java | 6 +++--- .../sidebar/MultiBranchProjectSidebar.java | 10 +++++----- .../sidebar/MultiConfigProjectSidebar.java | 6 +++--- .../sidebar/OrganizationFolderSidebar.java | 10 +++++----- .../sidebar/PipelineProjectSidebar.java | 12 ++++++------ .../redrover/{ => ui}/cucumber/FreestyleSteps.java | 10 +++++----- .../redrover/{ => ui}/cucumber/ViewSteps.java | 4 ++-- .../redrover/{ => ui}/page/AppearancePage.java | 2 +- .../{ => ui}/page/ArchitectingForScalePage.java | 2 +- .../page/BaseProjectConfigurationPage.java | 3 +-- .../{ => ui}/page/BaseProjectStatusPage.java | 4 ++-- .../{ => ui}/page/BuildHistoryOfJenkinsPage.java | 3 +-- .../school/redrover/{ => ui}/page/CloudsPage.java | 3 +-- .../redrover/{ => ui}/page/CreateViewPage.java | 2 +- .../redrover/{ => ui}/page/EditViewPage.java | 2 +- .../school/redrover/{ => ui}/page/ErrorPage.java | 2 +- .../{ => ui}/page/FolderBuildHistoryPage.java | 2 +- .../{ => ui}/page/FolderConfigurationPage.java | 2 +- .../{ => ui}/page/FolderCreateViewPage.java | 2 +- .../{ => ui}/page/FolderCredentialsPage.java | 3 +-- .../redrover/{ => ui}/page/FolderStatusPage.java | 4 ++-- .../redrover/{ => ui}/page/FolderViewPage.java | 2 +- .../{ => ui}/page/FreestyleProjectChangesPage.java | 2 +- .../page/FreestyleProjectConfigurationPage.java | 2 +- .../page/FreestyleProjectCredentialsPage.java | 2 +- .../{ => ui}/page/FreestyleProjectMovePage.java | 2 +- .../{ => ui}/page/FreestyleProjectStatusPage.java | 5 ++--- .../page/FreestyleProjectWorkspacePage.java | 3 +-- .../{ => ui}/page/GlobalCredentialsPage.java | 3 +-- .../school/redrover/{ => ui}/page/HomePage.java | 2 +- .../{ => ui}/page/JenkinsManagementPage.java | 3 +-- .../school/redrover/{ => ui}/page/LoginPage.java | 3 +-- .../school/redrover/{ => ui}/page/MovePage.java | 2 +- .../page/MultiBranchProjectBuildHistoryPage.java | 2 +- .../page/MultiBranchProjectCredentialsPage.java | 2 +- .../{ => ui}/page/MultiBranchProjectMovePage.java | 2 +- .../page/MultiConfigProjectBuildNowPage.java | 2 +- .../page/MultiConfigProjectChangesPage.java | 2 +- .../page/MultiConfigProjectConfigurationPage.java | 2 +- .../page/MultiConfigProjectCredentialsPage.java | 2 +- .../{ => ui}/page/MultiConfigProjectMovePage.java | 2 +- .../page/MultiConfigProjectStatusPage.java | 4 ++-- .../page/MultiConfigProjectWorkspacePage.java | 2 +- .../page/MultibranchProjectConfigurationPage.java | 2 +- .../page/MultibranchProjectStatusPage.java | 4 ++-- .../redrover/{ => ui}/page/NewCredentialsPage.java | 2 +- .../school/redrover/{ => ui}/page/NewItemPage.java | 2 +- .../school/redrover/{ => ui}/page/NewNodePage.java | 2 +- .../school/redrover/{ => ui}/page/NodesPage.java | 2 +- .../page/OrganizationFolderBuildHistoryPage.java | 2 +- .../page/OrganizationFolderConfigurationPage.java | 2 +- .../page/OrganizationFolderCredentialsPage.java | 2 +- .../{ => ui}/page/OrganizationFolderMovePage.java | 2 +- .../page/OrganizationFolderStatusPage.java | 4 ++-- .../{ => ui}/page/PipelineProjectBuildNowPage.java | 2 +- .../{ => ui}/page/PipelineProjectChangesPage.java | 2 +- .../page/PipelineProjectConfigurationPage.java | 2 +- .../page/PipelineProjectCredentialsPage.java | 2 +- .../page/PipelineProjectHistoryConsolePage.java | 2 +- .../{ => ui}/page/PipelineProjectHistoryPage.java | 2 +- .../{ => ui}/page/PipelineProjectMovePage.java | 2 +- .../{ => ui}/page/PipelineProjectStatusPage.java | 4 ++-- .../{ => ui}/page/PipelineProjectSyntaxPage.java | 2 +- .../{ => ui}/page/ProjectRenamingPage.java | 2 +- .../school/redrover/{ => ui}/page/RestApiPage.java | 2 +- .../{ => ui}/page/SystemConfigurationPage.java | 2 +- .../redrover/{ => ui}/page/UserAccountPage.java | 3 +-- .../redrover/{ => ui}/page/UserCreatingPage.java | 3 +-- .../redrover/{ => ui}/page/UserStatusPage.java | 2 +- .../school/redrover/{ => ui}/page/UsersPage.java | 2 +- .../school/redrover/{ => ui}/trait/BaseTrait.java | 2 +- .../project_sidebar/SidebarBuildHistoryTrait.java | 4 ++-- .../project_sidebar/SidebarBuildNowTrait.java | 4 ++-- .../trait/project_sidebar/SidebarChangesTrait.java | 4 ++-- .../project_sidebar/SidebarCredentialsTrait.java | 4 ++-- .../trait/project_sidebar/SidebarMoveTrait.java | 4 ++-- .../project_sidebar/SidebarWorkspaceTrait.java | 4 ++-- 120 files changed, 228 insertions(+), 241 deletions(-) rename src/test/java/school/redrover/{ => api}/APIFreestyleProjectTest.java (99%) rename src/test/java/school/redrover/{ => api}/APIJenkinsTest.java (99%) 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 (95%) 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 (91%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/MultiBranchProjectSidebar.java (82%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/MultiConfigProjectSidebar.java (91%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/OrganizationFolderSidebar.java (79%) rename src/test/java/school/redrover/{ => ui}/component/project/status_page/sidebar/PipelineProjectSidebar.java (79%) 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/FreestyleProjectMovePage.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/MovePage.java (96%) 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/MultiBranchProjectMovePage.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/MultiConfigProjectMovePage.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/OrganizationFolderMovePage.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/PipelineProjectMovePage.java (91%) 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/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/SidebarMoveTrait.java (81%) rename src/test/java/school/redrover/{ => ui}/trait/project_sidebar/SidebarWorkspaceTrait.java (83%) diff --git a/src/test/java/school/redrover/APIFreestyleProjectTest.java b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java similarity index 99% rename from src/test/java/school/redrover/APIFreestyleProjectTest.java rename to src/test/java/school/redrover/api/APIFreestyleProjectTest.java index 54f48b501..43f42b7f3 100644 --- a/src/test/java/school/redrover/APIFreestyleProjectTest.java +++ b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java @@ -1,4 +1,4 @@ -package school.redrover; +package school.redrover.api; import io.restassured.RestAssured; import io.restassured.http.ContentType; diff --git a/src/test/java/school/redrover/APIJenkinsTest.java b/src/test/java/school/redrover/api/APIJenkinsTest.java similarity index 99% rename from src/test/java/school/redrover/APIJenkinsTest.java rename to src/test/java/school/redrover/api/APIJenkinsTest.java index aed5b1c85..198006564 100644 --- a/src/test/java/school/redrover/APIJenkinsTest.java +++ b/src/test/java/school/redrover/api/APIJenkinsTest.java @@ -1,4 +1,4 @@ -package school.redrover; +package school.redrover.api; import io.restassured.RestAssured; import io.restassured.http.ContentType; 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..1b05d3d34 100644 --- a/src/test/java/school/redrover/common/BasePage.java +++ b/src/test/java/school/redrover/common/BasePage.java @@ -7,13 +7,13 @@ import org.openqa.selenium.support.PageFactory; 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; 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 7637ca616..fcd522ed5 100644 --- a/src/test/java/school/redrover/FolderTest.java +++ b/src/test/java/school/redrover/ui/FolderTest.java @@ -1,11 +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.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 95% 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..0da3ce8c3 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; 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 5bdcb3df5..96ba89aab 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,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 school.redrover.component.BaseComponent; -import school.redrover.page.BaseProjectConfigurationPage; -import school.redrover.page.BaseProjectStatusPage; -import school.redrover.page.ProjectRenamingPage; +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 91% 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 4ad6dbcc7..61e4e04d8 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 82% 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 eaaa1388c..c6bea7129 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,10 +1,10 @@ -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.trait.project_sidebar.SidebarMoveTrait; +import school.redrover.ui.page.*; +import school.redrover.ui.trait.project_sidebar.SidebarBuildHistoryTrait; +import school.redrover.ui.trait.project_sidebar.SidebarCredentialsTrait; +import school.redrover.ui.trait.project_sidebar.SidebarMoveTrait; 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 91% 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 f3995aee6..535500499 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 { 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 64101a7a4..6a3126c73 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/MovePage.java b/src/test/java/school/redrover/ui/page/MovePage.java similarity index 96% rename from src/test/java/school/redrover/page/MovePage.java rename to src/test/java/school/redrover/ui/page/MovePage.java index 9c646ea17..2bf2ccab0 100644 --- a/src/test/java/school/redrover/page/MovePage.java +++ b/src/test/java/school/redrover/ui/page/MovePage.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/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/MultiBranchProjectMovePage.java b/src/test/java/school/redrover/ui/page/MultiBranchProjectMovePage.java similarity index 91% rename from src/test/java/school/redrover/page/MultiBranchProjectMovePage.java rename to src/test/java/school/redrover/ui/page/MultiBranchProjectMovePage.java index b08a112cd..e4e12c53a 100644 --- a/src/test/java/school/redrover/page/MultiBranchProjectMovePage.java +++ b/src/test/java/school/redrover/ui/page/MultiBranchProjectMovePage.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/MultiConfigProjectMovePage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectMovePage.java similarity index 91% rename from src/test/java/school/redrover/page/MultiConfigProjectMovePage.java rename to src/test/java/school/redrover/ui/page/MultiConfigProjectMovePage.java index 2a46a9a29..e9b1525b0 100644 --- a/src/test/java/school/redrover/page/MultiConfigProjectMovePage.java +++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectMovePage.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/OrganizationFolderMovePage.java b/src/test/java/school/redrover/ui/page/OrganizationFolderMovePage.java similarity index 91% rename from src/test/java/school/redrover/page/OrganizationFolderMovePage.java rename to src/test/java/school/redrover/ui/page/OrganizationFolderMovePage.java index 808892d01..5a48f5af0 100644 --- a/src/test/java/school/redrover/page/OrganizationFolderMovePage.java +++ b/src/test/java/school/redrover/ui/page/OrganizationFolderMovePage.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/PipelineProjectMovePage.java b/src/test/java/school/redrover/ui/page/PipelineProjectMovePage.java similarity index 91% rename from src/test/java/school/redrover/page/PipelineProjectMovePage.java rename to src/test/java/school/redrover/ui/page/PipelineProjectMovePage.java index c3076525e..5ae8307b9 100644 --- a/src/test/java/school/redrover/page/PipelineProjectMovePage.java +++ b/src/test/java/school/redrover/ui/page/PipelineProjectMovePage.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/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/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/SidebarMoveTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarMoveTrait.java similarity index 81% rename from src/test/java/school/redrover/trait/project_sidebar/SidebarMoveTrait.java rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarMoveTrait.java index 7a2d40e75..14b780be1 100644 --- a/src/test/java/school/redrover/trait/project_sidebar/SidebarMoveTrait.java +++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarMoveTrait.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 SidebarMoveTrait> 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 815ac13dbf6a58a4d4a06f176a5672af08e5afb7 Mon Sep 17 00:00:00 2001 From: tstyev Date: Fri, 30 Jan 2026 23:59:24 +0300 Subject: [PATCH 3/6] API | Rename Freestyle Project #1921 --- .../school/redrover/ui/component/common/SearchComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/school/redrover/ui/component/common/SearchComponent.java b/src/test/java/school/redrover/ui/component/common/SearchComponent.java index 0da3ce8c3..6554c0fde 100644 --- a/src/test/java/school/redrover/ui/component/common/SearchComponent.java +++ b/src/test/java/school/redrover/ui/component/common/SearchComponent.java @@ -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) { From e570a8ab1d7e6f31bd42abac3cbabc9882886114 Mon Sep 17 00:00:00 2001 From: tstyev Date: Sat, 31 Jan 2026 00:28:20 +0300 Subject: [PATCH 4/6] API | Rename Freestyle Project #1921 --- .../ui/component/project/status_page/sidebar/FolderSidebar.java | 2 +- .../java/school/redrover/ui/page/FreestyleProjectMovePage.java | 0 src/test/java/school/redrover/ui/page/MovePage.java | 0 .../school/redrover/ui/page/MultiBranchProjectMovePage.java | 0 .../school/redrover/ui/page/MultiConfigProjectMovePage.java | 0 .../school/redrover/ui/page/OrganizationFolderMovePage.java | 0 .../java/school/redrover/ui/page/PipelineProjectMovePage.java | 0 src/test/java/school/redrover/ui/page/ProjectMovePage.java | 2 +- 8 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/test/java/school/redrover/ui/page/FreestyleProjectMovePage.java delete mode 100644 src/test/java/school/redrover/ui/page/MovePage.java delete mode 100644 src/test/java/school/redrover/ui/page/MultiBranchProjectMovePage.java delete mode 100644 src/test/java/school/redrover/ui/page/MultiConfigProjectMovePage.java delete mode 100644 src/test/java/school/redrover/ui/page/OrganizationFolderMovePage.java delete mode 100644 src/test/java/school/redrover/ui/page/PipelineProjectMovePage.java diff --git a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java index b1fc1ed12..6116d5dc2 100644 --- a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java +++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java @@ -9,7 +9,7 @@ import school.redrover.ui.trait.project_sidebar.SidebarCredentialsTrait; -public class FolderSidebar extends BaseSidebarComponent +public class FolderSidebar extends school.redrover.component.project.status_page.sidebar.BaseSidebarComponent implements SidebarBuildHistoryTrait, SidebarCredentialsTrait { @FindBy(xpath = "//a[contains(@href, '/newJob')]") diff --git a/src/test/java/school/redrover/ui/page/FreestyleProjectMovePage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectMovePage.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/test/java/school/redrover/ui/page/MovePage.java b/src/test/java/school/redrover/ui/page/MovePage.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/test/java/school/redrover/ui/page/MultiBranchProjectMovePage.java b/src/test/java/school/redrover/ui/page/MultiBranchProjectMovePage.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/test/java/school/redrover/ui/page/MultiConfigProjectMovePage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectMovePage.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/test/java/school/redrover/ui/page/OrganizationFolderMovePage.java b/src/test/java/school/redrover/ui/page/OrganizationFolderMovePage.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/test/java/school/redrover/ui/page/PipelineProjectMovePage.java b/src/test/java/school/redrover/ui/page/PipelineProjectMovePage.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/test/java/school/redrover/ui/page/ProjectMovePage.java b/src/test/java/school/redrover/ui/page/ProjectMovePage.java index 87c772293..129386246 100644 --- a/src/test/java/school/redrover/ui/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; From 2f4f28911a6e39631eb3a81c0a91fd85fde43898 Mon Sep 17 00:00:00 2001 From: tstyev Date: Sat, 31 Jan 2026 00:44:26 +0300 Subject: [PATCH 5/6] API | Rename Freestyle Project #1921 --- .../sidebar/BaseSidebarComponent.java | 8 ++------ .../status_page/sidebar/FolderSidebar.java | 2 +- .../sidebar/MultiBranchProjectSidebar.java | 11 +++++------ .../sidebar/OrganizationFolderSidebar.java | 9 ++++----- .../sidebar/PipelineProjectSidebar.java | 19 +++++++------------ .../project_sidebar/SidebarMoveTrait.java | 0 6 files changed, 19 insertions(+), 30 deletions(-) delete mode 100644 src/test/java/school/redrover/ui/trait/project_sidebar/SidebarMoveTrait.java diff --git a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java index 35a6ccf6e..e45e1780e 100644 --- a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java +++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java @@ -1,17 +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.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 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; diff --git a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java index 6116d5dc2..b1fc1ed12 100644 --- a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java +++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java @@ -9,7 +9,7 @@ import school.redrover.ui.trait.project_sidebar.SidebarCredentialsTrait; -public class FolderSidebar extends school.redrover.component.project.status_page.sidebar.BaseSidebarComponent +public class FolderSidebar extends BaseSidebarComponent implements SidebarBuildHistoryTrait, SidebarCredentialsTrait { @FindBy(xpath = "//a[contains(@href, '/newJob')]") diff --git a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiBranchProjectSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiBranchProjectSidebar.java index 1457be656..70b6c5e48 100644 --- a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiBranchProjectSidebar.java +++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiBranchProjectSidebar.java @@ -1,13 +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.ui.page.*; +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; -import school.redrover.ui.trait.project_sidebar.SidebarMoveTrait; -import school.redrover.page.*; -import school.redrover.trait.project_sidebar.SidebarBuildHistoryTrait; -import school.redrover.trait.project_sidebar.SidebarCredentialsTrait; public class MultiBranchProjectSidebar extends BaseSidebarComponent< diff --git a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/OrganizationFolderSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/OrganizationFolderSidebar.java index 9f90bb9d7..95ed36564 100644 --- a/src/test/java/school/redrover/ui/component/project/status_page/sidebar/OrganizationFolderSidebar.java +++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/OrganizationFolderSidebar.java @@ -1,13 +1,12 @@ package school.redrover.ui.component.project.status_page.sidebar; import org.openqa.selenium.WebDriver; -import school.redrover.ui.page.*; +import school.redrover.ui.page.OrganizationFolderBuildHistoryPage; +import school.redrover.ui.page.OrganizationFolderConfigurationPage; +import school.redrover.ui.page.OrganizationFolderCredentialsPage; +import school.redrover.ui.page.OrganizationFolderStatusPage; import school.redrover.ui.trait.project_sidebar.SidebarBuildHistoryTrait; import school.redrover.ui.trait.project_sidebar.SidebarCredentialsTrait; -import school.redrover.ui.trait.project_sidebar.SidebarMoveTrait; -import school.redrover.page.*; -import school.redrover.trait.project_sidebar.SidebarBuildHistoryTrait; -import school.redrover.trait.project_sidebar.SidebarCredentialsTrait; public class OrganizationFolderSidebar extends BaseSidebarComponent - implements SidebarChangesTrait, SidebarBuildNowTrait, - SidebarMoveTrait, SidebarCredentialsTrait { + implements SidebarChangesTrait, + SidebarBuildNowTrait, + SidebarCredentialsTrait { public PipelineProjectSidebar(WebDriver driver) { super(driver, PipelineProjectStatusPage::new); @@ -46,8 +45,4 @@ public PipelineProjectCredentialsPage getProjectCredentialsPage() { return new PipelineProjectCredentialsPage(getDriver()); } - @Override - public PipelineProjectMovePage getProjectMovePage() { - return new PipelineProjectMovePage(getDriver()); - } } diff --git a/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarMoveTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarMoveTrait.java deleted file mode 100644 index e69de29bb..000000000 From 287b09a9fed452808817884dcf91eb087d2d4946 Mon Sep 17 00:00:00 2001 From: tstyev Date: Sat, 31 Jan 2026 01:05:49 +0300 Subject: [PATCH 6/6] API | Rename Freestyle Project #1921 --- src/test/java/school/redrover/common/BasePage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/school/redrover/common/BasePage.java b/src/test/java/school/redrover/common/BasePage.java index 1b05d3d34..4b82cfaf3 100644 --- a/src/test/java/school/redrover/common/BasePage.java +++ b/src/test/java/school/redrover/common/BasePage.java @@ -5,6 +5,7 @@ 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.ui.component.common.JenkinsVersionFooterDropdown; @@ -74,7 +75,7 @@ public String getLogoText() { } public SearchComponent clickSearchButton() { - searchButton.click(); + getWait10().until(ExpectedConditions.visibilityOf(searchButton)).click(); return new SearchComponent(getDriver()).waitUntilComponentLoad(); }