Merge branch 'enhancement/run-activity' into bug/JENKINS-39992-dupe-rows

jenkinsci · Nov 24, 2016 · e9c41a2 · e9c41a2
2 parents 6b9768c + 10a39dc
commit e9c41a2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/src/test/js/notMultibranch/freestyleRunning.js b/src/test/js/notMultibranch/freestyleRunning.js
@@ -1,24 +1,25 @@
 /** @module freestyleRunning
- * @description Check can run non multibranch
+ * @memberof notMultibranch
+ * @description Freestyle running from activity screen
  */
 module.exports = {
-    /** Create freestyle Job "hijo"*/
+    /** Create freestyle Job */
     'Step 01': function (browser) {
         const freestyleCreate = browser.page.freestyleCreate().navigate();
-        freestyleCreate.createFreestyle('hijo', 'freestyle.sh');
+        freestyleCreate.createFreestyle('freeRun', 'freestyle.sh');
     },
 
     /** Build freestyle Job*/
     'Step 02': function (browser) {
-        var blueActivityPage = browser.page.bluePipelineActivity().forJob('hijo', 'jenkins');
+        var blueActivityPage = browser.page.bluePipelineActivity().forJob('freeRun', 'jenkins');
         blueActivityPage.waitForElementVisible('.run-button');
 
         // run the job
         blueActivityPage.click('.run-button');
         blueActivityPage.waitForElementVisible('@toastOpenButton')
 
         //check it spins and then is done  
-        blueActivityPage.waitForElementVisible('#hijo-1');                
+        blueActivityPage.waitForElementVisible('#freeRun-1');                
         blueActivityPage.waitForElementVisible('.progress-spinner');
         blueActivityPage.waitForElementVisible('.success');         
         blueActivityPage.waitForElementNotPresent('.progress-spinner');       

diff --git a/src/test/js/notMultibranch/index.js b/src/test/js/notMultibranch/index.js
@@ -0,0 +1,10 @@
+/** @module notMultibranch
+ * @memberof testcases
+ * @description Test running non multibranch projects
+ *
+ * @see {@link module:notMultibranch.freestyleRunning}
+ * @see {@link module:notMultibranch.pipelineRunning}
+ */
+module.exports = {
+
+};
diff --git a/src/test/js/notMultibranch/pipelineRunning.js b/src/test/js/notMultibranch/pipelineRunning.js
@@ -1,26 +1,27 @@
 /** @module pipelineRunning
- * @description Check can run non multibranch
+ * @memberof notMultibranch
+ * @description Check can run non multibranch pipelines from activity
  */
 module.exports = {
     /** Create pipeline Job */
     'Step 01': function (browser) {
         const pipelinesCreate = browser.page.pipelineCreate().navigate();
         // we have used the noStages script as basis
-        pipelinesCreate.createPipeline("pipey", 'no-stages.groovy');
+        pipelinesCreate.createPipeline("pipeRun", 'no-stages.groovy');
     },
 
 
-    /** Build freestyle Job*/
+    /** Build pipeline Job*/
     'Step 02': function (browser) {
-        var blueActivityPage = browser.page.bluePipelineActivity().forJob('pipey', 'jenkins');
+        var blueActivityPage = browser.page.bluePipelineActivity().forJob('pipeRun', 'jenkins');
         blueActivityPage.waitForElementVisible('.run-button');
 
         // run the job
         blueActivityPage.click('.run-button');
         blueActivityPage.waitForElementVisible('@toastOpenButton')
 
         //check it spins and then is done  
-        blueActivityPage.waitForElementVisible('#pipey-1');                
+        blueActivityPage.waitForElementVisible('#pipeRun-1');                
         blueActivityPage.waitForElementVisible('.progress-spinner');
         blueActivityPage.waitForElementVisible('.success');         
         blueActivityPage.waitForElementNotPresent('.progress-spinner');