refactor

zanata · Jan 17, 2013 · ee41175 · ee41175
1 parent e8af2d8
commit ee41175
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 37 deletions.
diff --git a/functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java b/functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
@@ -13,6 +13,7 @@
 import org.zanata.page.projects.ProjectPage;
 import org.zanata.page.projects.ProjectsPage;
 import org.zanata.workflow.LoginWorkFlow;
+import org.zanata.workflow.ProjectWorkFlow;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -25,30 +26,14 @@
 public class CreateNewProjectTest
 {
 
-   private HomePage homePage;
-
    @Before
    public void beforeMethod()
    {
-      homePage = new LoginWorkFlow().signIn("admin", "admin");
+      new LoginWorkFlow().signIn("admin", "admin");
    }
 
    public ProjectPage createNewProject(String projectSlug, String projectName)
    {
-      ProjectsPage projectsPage = homePage.goToProjects();
-      List<String> projects = projectsPage.getProjectNamesOnCurrentPage();
-      log.info("current projects: {}", projects);
-
-      if (projects.contains(projectName))
-      {
-         CreateNewProjectTest.log.warn("{} has already been created. Presumably you are running test manually and more than once.", projectSlug);
-         //since we can't create same project multiple times,
-         //if we run this test more than once manually, we don't want it to fail
-         return projectsPage.goToProject(projectName);
-      }
-      else
-      {
-         return projectsPage.clickOnCreateProjectLink().inputProjectId(projectSlug).inputProjectName(projectName).saveProject();
-      }
+      return new ProjectWorkFlow().createNewProject(projectSlug, projectName);
    }
 }
diff --git a/...st/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java b/...st/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
@@ -13,6 +13,7 @@
 import org.zanata.page.projects.ProjectVersionPage;
 import org.zanata.page.projects.ProjectsPage;
 import org.zanata.workflow.LoginWorkFlow;
+import org.zanata.workflow.ProjectWorkFlow;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -24,30 +25,16 @@
 @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class})
 public class CreateVersionAndAddToProjectTest
 {
-   private HomePage homePage;
 
    @Before
    public void beforeMethod()
    {
-      homePage = new LoginWorkFlow().signIn("admin", "admin");
+      new LoginWorkFlow().signIn("admin", "admin");
    }
    public ProjectPage createNewProjectVersion(String projectName, String versionSlug)
    {
-      ProjectsPage projectsPage = homePage.goToProjects();
-      ProjectPage projectPage = projectsPage.goToProject(projectName);
-      if (projectPage.getVersions().contains(versionSlug))
-      {
-         log.warn("{} has already been created. Presumably you are running test manually and more than once.", versionSlug);
-         return projectPage;
-      }
-      else
-      {
-         CreateVersionPage createVersionPage = projectPage.clickCreateVersionLink().inputVersionId(versionSlug);
-         createVersionPage.selectStatus("READONLY");
-         createVersionPage.selectStatus("ACTIVE");
-         ProjectVersionPage projectVersionPage = createVersionPage.saveVersion();
-         projectsPage = projectVersionPage.goToPage("Projects", ProjectsPage.class);
-         return projectsPage.goToProject(projectName);
-      }
+      ProjectVersionPage projectVersionPage = new ProjectWorkFlow().createNewProjectVersion(projectName, versionSlug);
+      ProjectsPage projectsPage = projectVersionPage.goToPage("Projects", ProjectsPage.class);
+      return projectsPage.goToProject(projectName);
    }
 }
diff --git a/...st/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateNewProject.html b/...st/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateNewProject.html
@@ -3,7 +3,7 @@
 </head>
 <body>
     <p>
-        As a user logged in as admin,
+        As a user on Zanata,
         when I want to create a project with
         id: <span c:set="#projectSlug">plurals</span> and name <span c:set="#projectName">plural projects</span>,
         I go to projects page, click on <span c:execute="#projectPage = createNewProject(#projectSlug, #projectName)">Create project</span> link and fill in the data.