Skip to content
Permalink
Browse files

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

  • Loading branch information...
scherler committed Sep 7, 2016
2 parents d3b6e57 + 0c12cc0 commit f73dda189ce92619f4999a0135932178c72c56c1
Showing with 8 additions and 2 deletions.
  1. +6 −0 src/main/js/page_objects/blueocean/bluePipelineRunDetail.js
  2. +2 −2 src/test/js/queued.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');
@@ -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) {

0 comments on commit f73dda1

Please sign in to comment.
You can’t perform that action at this time.