Merge remote-tracking branch 'origin/master' into JENKINS-37323

jenkinsci · Sep 7, 2016 · f73dda1 · f73dda1
2 parents d3b6e57 + 0c12cc0
commit f73dda1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/js/page_objects/blueocean/bluePipelineRunDetail.js b/src/main/js/page_objects/blueocean/bluePipelineRunDetail.js
@@ -11,6 +11,7 @@ module.exports = {
         followAlongOn: '.step-scroll-area.follow-along-on',
         followAlongOff: '.step-scroll-area.follow-along-off',
         emptystate: 'div.empty-state',
+        emptystateQueued: 'div.empty-state span.waiting',
         detailTitle: 'section.table',
         closeButton: 'a.closeButton',
         activityTable: '.activity-table',
@@ -148,6 +149,11 @@ module.exports.commands = [{
         self.waitForElementVisible('@emptystate');
         return self;
     },
+    validateQueued: function () {
+        var self = this;
+        self.waitForElementVisible('@emptystateQueued');
+        return self;
+    },
     validateNotEmptyArtifacts: function (browser, expectedCount) {
         var self = this;
         self.waitForElementVisible('@artifactTable');

diff --git a/src/test/js/queued.js b/src/test/js/queued.js
@@ -41,13 +41,13 @@ module.exports = {
     'Validate queued state on freestyle job': !function (browser) {
         const blueRunDetailPage = browser.page.bluePipelineRunDetail()
             .forRun(jobNameFreestyle, 'jenkins', 1);
-        blueRunDetailPage.validateEmpty();
+        blueRunDetailPage.validateQueued();
     },
 
     'Validate queued state on multibranch job': function (browser) {
         const blueRunDetailPage = browser.page.bluePipelineRunDetail()
             .forRun(multiBranchJob, 'jenkins', 'feature%2F1', 1);
-        blueRunDetailPage.validateEmpty();
+        blueRunDetailPage.validateQueued();
     },
 
     'Test queued jobs - enable executors': function (browser) {