API Test create user

src/test/java/school/redrover/APIJenkinsTest.java → src/test/java/school/redrover/api/APIFreestyleProjectTest.java

@@ -1,39 +1,21 @@
-package school.redrover;
+package school.redrover.api;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
-import io.restassured.response.ResponseBody;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.APIBaseTest;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class APIJenkinsTest extends APIBaseTest {
+public class APIFreestyleProjectTest extends APIBaseTest {
 
-    @Test
-    public void jenkinsTest() {
-        RestAssured.given()
-                .log().all()// ← добавил что бы смотреть, что отправляю и что получаю(в конце лог)
-                .when()
-                .auth()
-                .preemptive()
-                .basic(userName, apiToken)
-                .when()
-                .get(jenkinsUrl + "api/json")
-                .then()
-                .log().all()
-                .statusCode(200);
-    }
-
-    @Test
-    public void testCreateFreestyleProjectWithValidName() {
-        Map<String, String> projectName = new HashMap<>();
-        projectName.put("name", "FreestyleProjectName");
+    private static final String PROJECT_NAME = "FreestyleProject";
+    private static final String NEW_PROJECT_NAME = "NewFreestyleProject";
 
-        String bodyFreestyleProjectXML = """
+    private static final String bodyXML = """
                 <project>
                     <keepDependencies>false</keepDependencies>
                     <properties/>
@@ -48,15 +30,20 @@ public void testCreateFreestyleProjectWithValidName() {
                     <publishers/>
                     <buildWrappers/>
                 </project>
-                """;
+            """;
+
+    @Test
+    public void testCreateWithValidName() {
+        Map<String, String> 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(bodyFreestyleProjectXML)
+                .body(bodyXML)
                 .when()
                 .post("/createItem")
                 .then()
@@ -81,57 +68,47 @@ public void testCreateFreestyleProjectWithValidName() {
     }
 
     @Test
-    public void testCreatePiplineAndDisable() {
+    public void testRenameProject() {
         Map<String, String> projectName = new HashMap<>();
-        projectName.put("name", "Pipline");
-
-        String bodyPiplineXML = """
-                 <flow-definition plugin="workflow-job@1559.va_a_533730b_ea_d">
-                                          <keepDependencies>false</keepDependencies>
-                                          <properties/>
-                                          <triggers/>
-                                          <disabled>false</disabled>
-                                          </flow-definition>
-                """;
+        projectName.put("name", PROJECT_NAME);
 
         RestAssured.given()
+                .log().all()
                 .auth().preemptive().basic(userName, apiToken)
                 .baseUri(jenkinsUrl)
                 .contentType(ContentType.XML)
                 .queryParams(projectName)
-                .body(bodyPiplineXML)
+                .body(bodyXML)
                 .when()
                 .post("/createItem")
                 .then()
                 .log().all()
                 .statusCode(200);
 
-        Response response = RestAssured.given()
+        RestAssured.given()
                 .log().all()
                 .auth().preemptive().basic(userName, apiToken)
                 .baseUri(jenkinsUrl)
+                .contentType("application/x-www-form-urlencoded")
+                .queryParam("newName", NEW_PROJECT_NAME)
                 .when()
-                .post("job/%s/disable".formatted(projectName.get("name")))
+                .post("job/%s/confirmRename".formatted(projectName.get("name")))
                 .then()
                 .log().all()
-                .extract().response();
-
-        String location = response.getHeader("Location");
+                .statusCode(302);
 
-        Response getResponse = RestAssured.given()
+        Response response = RestAssured.given()
+                .log().all()
                 .auth().preemptive().basic(userName, apiToken)
                 .baseUri(jenkinsUrl)
                 .when()
-                .get(location)
+                .get("job/%s/api/json".formatted(NEW_PROJECT_NAME))
                 .then()
                 .log().all()
                 .statusCode(200)
                 .extract().response();
 
-        String responseBody = getResponse.getBody().asString();
-
-        Assert.assertEquals(response.getStatusCode(), 302);
-        Assert.assertEquals(getResponse.getStatusCode(), 200);
-        Assert.assertTrue(responseBody.contains("This project is currently disabled"));
+        String actualProjectName = response.jsonPath().getString("name");
+        Assert.assertEquals(actualProjectName, NEW_PROJECT_NAME);
     }
 }

src/test/java/school/redrover/api/APIJenkinsTest.java

@@ -0,0 +1,160 @@
+package school.redrover.api;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.response.Response;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import school.redrover.common.APIBaseTest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class APIJenkinsTest extends APIBaseTest {
+
+    @Test
+    public void testCreatePiplineAndDisable() {
+        Map<String, String> projectName = new HashMap<>();
+        projectName.put("name", "Pipline");
+
+        String bodyPiplineXML = """
+                 <flow-definition plugin="workflow-job@1559.va_a_533730b_ea_d">
+                                          <keepDependencies>false</keepDependencies>
+                                          <properties/>
+                                          <triggers/>
+                                          <disabled>false</disabled>
+                                          </flow-definition>
+                """;
+
+        RestAssured.given()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .contentType(ContentType.XML)
+                .queryParams(projectName)
+                .body(bodyPiplineXML)
+                .when()
+                .post("/createItem")
+                .then()
+                .log().all()
+                .statusCode(200);
+
+        Response response = RestAssured.given()
+                .log().all()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .when()
+                .post("job/%s/disable".formatted(projectName.get("name")))
+                .then()
+                .log().all()
+                .extract().response();
+
+        String location = response.getHeader("Location");
+
+        Response getResponse = RestAssured.given()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .when()
+                .get(location)
+                .then()
+                .log().all()
+                .statusCode(200)
+                .extract().response();
+
+        String responseBody = getResponse.getBody().asString();
+
+        Assert.assertEquals(response.getStatusCode(), 302);
+        Assert.assertEquals(getResponse.getStatusCode(), 200);
+        Assert.assertTrue(responseBody.contains("This project is currently disabled"));
+    }
+
+    @Test
+    public void testCreateAndDeleteFolder() {
+        String folderName = "ApiTestFolder";
+
+        String folderConfigXml = """
+                <com.cloudbees.hudson.plugins.folder.Folder>
+                    <description>Created via CloudBees Folder Plugin API</description>
+                </com.cloudbees.hudson.plugins.folder.Folder>
+                """;
+
+        RestAssured.given()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .contentType(ContentType.XML)
+                .queryParam("name", folderName)
+                .body(folderConfigXml)
+                .when()
+                .post("/createItem")
+                .then()
+                .statusCode(200);
+
+        Response getResponse = RestAssured.given()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .when()
+                .get("job/%s/api/json".formatted(folderName))
+                .then()
+                .extract().response();
+
+        Assert.assertEquals(getResponse.statusCode(), 200);
+        Assert.assertEquals(getResponse.jsonPath().getString("name"), folderName);
+
+        RestAssured.given()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .when()
+                .post("job/%s/doDelete".formatted(folderName))
+                .then()
+                .statusCode(302);
+
+        Response deletedResponse = RestAssured.given()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .when()
+                .get("job/%s/api/json".formatted(folderName))
+                .then()
+                .extract().response();
+
+        Assert.assertEquals(deletedResponse.statusCode(), 404,
+                "Expected 404 after deletion, but got " + deletedResponse.statusCode());
+    }
+
+    @Test
+    public void testCreateUser() {
+        Map<String, String> userData = new HashMap<>();
+        userData.put("username", "UserUser");
+        userData.put("password1", "passwordUser");
+        userData.put("password2", "passwordUser");
+        userData.put("fullname", "UserUserName");
+        userData.put("email", "user@user.us");
+
+        Response response = RestAssured.given()
+                .log().all()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .queryParams(userData)
+                .when()
+                .post("securityRealm/createAccountByAdmin")
+                .then()
+                .log().all()
+                .extract().response();
+
+        String location = response.getHeader("Location");
+
+        Response getResponse = RestAssured.given()
+                .log().all()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .when()
+                .get("%s".formatted(location))
+                .then()
+                .log().all()
+                .extract().response();
+
+        String responseBody = getResponse.getBody().asString();
+
+        Assert.assertEquals(response.getStatusCode(), 302);
+        Assert.assertEquals(getResponse.getStatusCode(), 200);
+        Assert.assertTrue(responseBody.contains(userData.get("username")));
+    }
+}

src/test/java/school/redrover/APITest.java → 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;
 

src/test/java/school/redrover/common/BasePage.java

@@ -5,15 +5,16 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-import school.redrover.component.common.JenkinsVersionFooterDropdown;
-import school.redrover.component.common.SearchComponent;
-import school.redrover.component.common.UserAccountIconDropdown;
-import school.redrover.page.HomePage;
-import school.redrover.page.JenkinsManagementPage;
-import school.redrover.page.RestApiPage;
-import school.redrover.page.UserStatusPage;
+import school.redrover.ui.component.common.JenkinsVersionFooterDropdown;
+import school.redrover.ui.component.common.SearchComponent;
+import school.redrover.ui.component.common.UserAccountIconDropdown;
+import school.redrover.ui.page.HomePage;
+import school.redrover.ui.page.JenkinsManagementPage;
+import school.redrover.ui.page.RestApiPage;
+import school.redrover.ui.page.UserStatusPage;
 
 import java.util.Objects;
 
@@ -74,7 +75,7 @@ public String getLogoText() {
     }
 
     public SearchComponent clickSearchButton() {
-        searchButton.click();
+        getWait10().until(ExpectedConditions.visibilityOf(searchButton)).click();
 
         return new SearchComponent(getDriver()).waitUntilComponentLoad();
     }

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 {

src/test/java/school/redrover/common/filter/FilterForTestsTest.java

@@ -74,8 +74,8 @@ public void testModifiedTest() {
     public void testClassWithDependencies() {
         List<String> 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<IMethodInstance> methodList = List.of(
                 new FilterMock.MethodInstanceImpl(FakeTestClass.class),
@@ -97,7 +97,7 @@ public void testClassWithDependencies() {
     public void testOneDependency() {
         List<String> 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<IMethodInstance> methodList = List.of(new FilterMock.MethodInstanceImpl(FakeTestClass.class));
 
@@ -115,8 +115,8 @@ public void testOneDependency() {
     public void testClassWithDependencyChain() {
         List<String> 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<IMethodInstance> methodList = List.of(
                 new FilterMock.MethodInstanceImpl(FakeTestClass.class)