diff options
3 files changed, 3 insertions, 20 deletions
diff --git a/src/main/java/com/mavlushechka/a1qa/project/constants/Project.java b/src/main/java/com/mavlushechka/a1qa/project/constants/Project.java deleted file mode 100644 index a8c9421..0000000 --- a/src/main/java/com/mavlushechka/a1qa/project/constants/Project.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mavlushechka.a1qa.project.constants; - -public enum Project { - - BERCUT(3), BRAND_ALLEY(2), ENVISIA(5), LOTA(6), MEGAFON(4), NEXAGE(1); - - - public final int id; - - - Project(int id) { - this.id = id; - } - -} diff --git a/src/main/java/com/mavlushechka/a1qa/project/pages/ProjectsPage.java b/src/main/java/com/mavlushechka/a1qa/project/pages/ProjectsPage.java index eac51f1..bf670fc 100644 --- a/src/main/java/com/mavlushechka/a1qa/project/pages/ProjectsPage.java +++ b/src/main/java/com/mavlushechka/a1qa/project/pages/ProjectsPage.java @@ -7,7 +7,6 @@ import aquality.selenium.forms.Form; import com.mavlushechka.a1qa.framework.utils.IntegerUtils; import com.mavlushechka.a1qa.framework.utils.JsonParser; import com.mavlushechka.a1qa.framework.utils.StringUtils; -import com.mavlushechka.a1qa.project.constants.Project; import com.mavlushechka.a1qa.project.models.User; import org.openqa.selenium.By; @@ -51,10 +50,10 @@ public class ProjectsPage extends Form { return projects; } - public void openProject(Project project) { + public void openProject(String projectName) { AqualityServices.getElementFactory().get( ElementType.BUTTON, - By.xpath("//*[contains(@class, 'panel')]//*[contains(@class, 'list-group')]//a[contains(@class, 'list-group-item') and @href='allTests?projectId=%d']".formatted(project.id)), + By.xpath("//*[contains(@class, 'panel')]//a[contains(@class, 'list-group-item') and text()='%s']".formatted(projectName)), "Project" ).clickAndWait(); } diff --git a/src/test/java/com/mavlushechka/a1qa/project/TestCase1.java b/src/test/java/com/mavlushechka/a1qa/project/TestCase1.java index 1463eb5..a690ee2 100644 --- a/src/test/java/com/mavlushechka/a1qa/project/TestCase1.java +++ b/src/test/java/com/mavlushechka/a1qa/project/TestCase1.java @@ -5,7 +5,6 @@ import com.mavlushechka.a1qa.framework.BaseTest; import com.mavlushechka.a1qa.framework.utils.JsonParser; import com.mavlushechka.a1qa.framework.utils.LoggerUtils; import com.mavlushechka.a1qa.framework.utils.StringUtils; -import com.mavlushechka.a1qa.project.constants.Project; import com.mavlushechka.a1qa.project.models.User; import com.mavlushechka.a1qa.project.pages.AddProjectPage; import com.mavlushechka.a1qa.project.pages.ProjectsPage; @@ -39,7 +38,7 @@ public class TestCase1 extends BaseTest { Assert.assertEquals(projectsPage.getVersion(), variant, "The variant is not correct."); LoggerUtils.step("Go to the Nexage project page. Query the api to get a list of tests in JSON/XML format."); - projectsPage.openProject(Project.NEXAGE); + projectsPage.openProject(JsonParser.parseData("testData", "project.name")); TestsPage testsPage = new TestsPage(); Assert.assertTrue(testsPage.state().waitForDisplayed(), "The %s page is not opened.".formatted(testsPage.getName())); List<com.mavlushechka.a1qa.project.models.Test> allRunningTestsOnSite = testsPage.getAllRunningTests(); |