Merge pull request #9088 from rundeck/qaf-migration2

RPL-7: QAF-migration2

functional-test/build.gradle

@@ -77,13 +77,3 @@ task seleniumCoreTest(type: Test){
     systemProperty('spock.configuration', 'spock-configs/IncludeSeleniumCoreTestsConfig.groovy')
     description = "Run Rundeck OSS Selenium Tests"
 }
-
-task tomcatTest(type: Test){
-    useJUnitPlatform()
-    systemProperty("DEFAULT_DOCKERFILE_LOCATION", "docker/file/tomcat/Dockerfile")
-    systemProperty('spock.configuration', 'spock-configs/IncludeAPITestsConfig.groovy')
-    description = "Run Rundeck OSS API Tests on a tomcat environment"
-    doFirst{
-        checkWarFile("${buildDir}/resources/test/docker/file/tomcat/data/", "rundeck-launcher.war")
-    }
-}

functional-test/src/test/groovy/org/rundeck/tests/functional/api/job/JobExecutionSpec.groovy

@@ -234,7 +234,7 @@ class JobExecutionSpec extends BaseContainer {
         assert responseProject.successful
 
         def jobName1 = "xmljob"
-        def jobXml1 = JobUtils.generateExecForEnabledXmlTest(jobName1)
+        def jobXml1 = JobUtils.generateScheduledExecutionXml(jobName1)
 
         def job1CreatedResponse = JobUtils.createJob(projectName, jobXml1, client)
         assert job1CreatedResponse.successful
@@ -308,10 +308,10 @@ class JobExecutionSpec extends BaseContainer {
         assert responseProject.successful
 
         def jobName1 = "xmljob"
-        def jobXml1 = JobUtils.generateExecForEnabledXmlTest(jobName1)
+        def jobXml1 = JobUtils.generateScheduledExecutionXml(jobName1)
 
         def jobName2 = "xmljob2"
-        def jobXml2 = JobUtils.generateExecForEnabledXmlTest(jobName2)
+        def jobXml2 = JobUtils.generateScheduledExecutionXml(jobName2)
 
         def job1CreatedResponse = JobUtils.createJob(projectName, jobXml1, client)
         assert job1CreatedResponse.successful

functional-test/src/test/groovy/org/rundeck/tests/functional/selenium/jobs/JobReferenceSpec.groovy

@@ -21,7 +21,7 @@ class JobReferenceSpec extends SeleniumBase {
 
     def "import options from parent"(){
         setup:
-        final String projectName = 'ImportOptionsTest'
+        String projectName = 'ImportOptionsTest'
         setupProjectArchiveDirectoryResource(projectName, "${PROJECT_LOCATION}/${projectName}.rdproject")
         JobShowPage jobPage = page(JobShowPage, projectName).forJob('ffc04705-13c1-47b7-840e-3f23f0dd4f86')
         jobPage.go()
@@ -32,11 +32,13 @@ class JobReferenceSpec extends SeleniumBase {
         then:
         noExceptionThrown()
         executionPage.getLogOutput().first().getText() == 'Hello'
+        cleanup:
+        deleteProject(projectName)
     }
 
     def "pass parent option as an argument to child"(){
         setup:
-        final String projectName = 'JobReferenceCreationUsingArgTest'
+        String projectName = 'JobReferenceCreationUsingArgTest'
         setupProjectArchiveDirectoryResource(projectName, "${PROJECT_LOCATION}/${projectName}.rdproject")
         JobShowPage jobPage = page(JobShowPage, projectName).forJob('54dc738b-02aa-4d56-8b6b-45f93f47a0d6')
         jobPage.go()
@@ -47,11 +49,13 @@ class JobReferenceSpec extends SeleniumBase {
         then:
         noExceptionThrown()
         executionPage.getLogOutput().first().getText() == 'parent option default value'
+        cleanup:
+        deleteProject(projectName)
     }
 
     def "create a job with referenced execution node step by uuid and run it successfully"(){
         setup:
-        final String projectName = 'JobReferenceUUIDTest'
+        String projectName = 'JobReferenceUUIDTest'
         setupProject(projectName)
         String jobUuid = JobUtils.jobImportFile(projectName, '/test-files/simple-job-ref.xml', client).succeeded.first().id
 
@@ -73,11 +77,13 @@ class JobReferenceSpec extends SeleniumBase {
             executionPage.getExecutionStatus() == 'SUCCEEDED'
             executionPage.getLogOutput().first().getText() == 'this is my jobref'
         }
+        cleanup:
+        deleteProject(projectName)
     }
 
     def "create a job with referenced execution node step by name and run it successfully"(){
         setup:
-        final String projectName = 'JobReferenceByNameTest'
+        String projectName = 'JobReferenceByNameTest'
         setupProject(projectName)
 
         expect:
@@ -101,11 +107,13 @@ class JobReferenceSpec extends SeleniumBase {
             executionPage.getExecutionStatus() == 'SUCCEEDED'
             executionPage.getLogOutput().first().getText() == 'this is my jobref'
         }
+        cleanup:
+        deleteProject(projectName)
     }
 
     def "create a job with referenced execution workflow step by using 'choose a job' button and run it successfully"() {
         setup:
-        final String projectName = 'JobReferenceByNameTest'
+        String projectName = 'JobReferenceByNameTest'
         setupProject(projectName)
 
         expect:
@@ -130,11 +138,13 @@ class JobReferenceSpec extends SeleniumBase {
             executionPage.getExecutionStatus() == 'SUCCEEDED'
             executionPage.getLogOutput().first().getText() == 'this is my jobref'
         }
+        cleanup:
+        deleteProject(projectName)
     }
 
     def "override node filters thread count"(){
         setup:
-        final String projectName = 'JobRefThreadCountTest'
+        String projectName = 'JobRefThreadCountTest'
         setupProjectArchiveDirectoryResource(projectName, "${PROJECT_LOCATION}/${projectName}.rdproject")
         JobShowPage jobPage = page(JobShowPage, projectName).forJob('9b559a6a-4578-4a8c-9c55-3e7ab2056341')
         jobPage.go()
@@ -145,5 +155,7 @@ class JobReferenceSpec extends SeleniumBase {
         then:
         noExceptionThrown()
         executionPage.getLogOutput().first().getText() == '1'
+        cleanup:
+        deleteProject(projectName)
     }
 }

functional-test/src/test/groovy/org/rundeck/tests/functional/selenium/project/EditProjectSpec.groovy

@@ -134,9 +134,11 @@ class EditProjectSpec extends SeleniumBase {
         def projectEditPage = page ProjectEditPage
         def projectDashboard = page DashboardPage
         def loginPage = go LoginPage
+        def homePage = page HomePage
 
         when:
         loginPage.login(TEST_USER, TEST_PASS)
+        homePage.validatePage()
         projectEditPage.go("/project/${projectName}/configure")
         projectEditPage.setProjectDescription(projectDescription)
         projectEditPage.save()

functional-test/src/test/groovy/org/rundeck/util/common/jobs/JobUtils.groovy

@@ -61,13 +61,14 @@ class JobUtils {
         return client.doPostWithRawText(CREATE_JOB_ENDPOINT, "application/xml", jobDefinitionXml)
     }
 
-    static def generateExecForEnabledXmlTest(String jobName){
+    static def generateScheduledExecutionXml(String jobName){
         return  "<joblist>\n" +
                 "   <job>\n" +
                 "      <name>${jobName}</name>\n" +
                 "      <group>api-test</group>\n" +
                 "      <description></description>\n" +
                 "      <loglevel>INFO</loglevel>\n" +
+                "      <multipleExecutions>true</multipleExecutions>\n" +
                 "      <dispatch>\n" +
                 "        <threadcount>1</threadcount>\n" +
                 "        <keepgoing>true</keepgoing>\n" +
@@ -81,19 +82,20 @@ class JobUtils {
                 "</joblist>"
     }
 
-    static def generateScheduledJobsXml(String jobname){
+    static def generateScheduledJobsXml(String jobname, String schedule = "<time hour='*' seconds='*' minute='0/20' />"){
         return "<joblist>\n" +
                 "   <job>\n" +
                 "      <name>${jobname}</name>\n" +
                 "      <group>api-test</group>\n" +
                 "      <description></description>\n" +
                 "      <loglevel>INFO</loglevel>\n" +
+                "      <multipleExecutions>true</multipleExecutions>\n" +
                 "      <dispatch>\n" +
                 "        <threadcount>1</threadcount>\n" +
                 "        <keepgoing>true</keepgoing>\n" +
                 "      </dispatch>\n" +
                 "      <schedule>\n" +
-                "        <time hour='*' seconds='*' minute='0/20' />\n" +
+                "        ${schedule}\n" +
                 "        <month month='*' />\n" +
                 "        <year year='*' />\n" +
                 "      </schedule>\n" +

functional-test/src/test/groovy/org/rundeck/util/gui/pages/activity/ActivityPage.groovy

@@ -26,4 +26,8 @@ class ActivityPage extends BasePage {
         el timeAbs
     }
 
+    List<WebElement> getActivityRowsByJobName(String jobName) {
+        els By.xpath("//*[contains(text(),'${jobName}')]")
+    }
+
 }