Dduvall has submitted this change and it was merged. Change subject: Omit background steps from scenarios ......................................................................
Omit background steps from scenarios Change-Id: I4b0a86e791e78d8f22f36862ee167cffb9ba1b71 --- M src/pl-element.tag M src/pl-feature.tag 2 files changed, 29 insertions(+), 10 deletions(-) Approvals: Dduvall: Verified; Looks good to me, approved diff --git a/src/pl-element.tag b/src/pl-element.tag index 74b0c90..9986bd1 100644 --- a/src/pl-element.tag +++ b/src/pl-element.tag @@ -3,16 +3,15 @@ <p><span class="label label-{ statuses[status] }">{ status }</span></p> <div class="steps list-group"> - <pl-step each={ steps } + <pl-step each={ nonBackgroundSteps() } class="list-group-item list-group-item-{ parent.statuses[result.status] }"></pl-step> </div> <script> - this.statuses = { - 'passed': 'success', - 'skipped': 'warning', - 'failed': 'danger' - }; + var self = this; + + self.background = opts.background; + self.statuses = { 'passed': 'success', 'skipped': 'warning', 'failed': 'danger' }; function statusOf(steps) { for (var i = 0; i < steps.length; i++) { @@ -26,9 +25,17 @@ return 'passed'; }; - this.on('update', function () { - if (this.steps) { - this.status = statusOf(this.steps); + self.nonBackgroundSteps = function () { + if (self.type === 'background' || !self.background) { + return self.steps; + } else { + return self.steps.slice(self.background.steps.length); + } + }; + + self.on('update', function () { + if (self.steps) { + self.status = statusOf(self.steps); } }); </script> diff --git a/src/pl-feature.tag b/src/pl-feature.tag index 90daf59..3c3a7d8 100644 --- a/src/pl-feature.tag +++ b/src/pl-feature.tag @@ -1,6 +1,18 @@ <pl-feature> <h4 class="list-group-item-heading"><span class="keyword">{ keyword }</span>: { name }</h4> <div class="scenarios list-group"> - <pl-element each={ elements } class="list-group-item"></pl-element> + <pl-element each={ elements } background={ parent.background } class="list-group-item"></pl-element> </div> + + <script> + var self = this; + + self.elements = []; + + self.on('update', function () { + if (self.elements.length > 0 && self.elements[0].type === 'background') { + self.background = self.elements[0]; + } + }); + </script> </pl-feature> -- To view, visit https://gerrit.wikimedia.org/r/206872 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b0a86e791e78d8f22f36862ee167cffb9ba1b71 Gerrit-PatchSet: 1 Gerrit-Project: integration/raita Gerrit-Branch: master Gerrit-Owner: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits