[JENKINS-37323] fix merge problem and make sure we returning always s…

…elf and not coditional
jenkinsci · Sep 8, 2016 · b1ec3e1 · b1ec3e1
1 parent d3547ca
commit b1ec3e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/js/page_objects/blueocean/bluePipelineRunDetail.js b/src/main/js/page_objects/blueocean/bluePipelineRunDetail.js
@@ -48,8 +48,8 @@ const notEmptyHelper = function (selector, self, expectedMinimum) {
         } else {
             self.assert.equal(codeCollection.value.length > 0, true);
         }
-        return self;
     });
+    return self;
 };
 module.exports = {
     elements: {
@@ -187,8 +187,8 @@ module.exports.commands = [{
             // current, this is the reason, why no url change is triggered. The question remains
             // why that is happening
             // this.pause(10000)
-            return self;
         })
+        return self;
     },
     /*
      * Navigate to a certain tab by clicking on it
@@ -222,9 +222,9 @@ module.exports.commands = [{
                 self.validateLoading();
                 // did we changed the url on  change?
                 self.assert.equal(responseInner.value.includes('start=0'), true);
-                return self;
             })
         })
+        return self;
 
     },
     /*
@@ -247,6 +247,7 @@ module.exports.commands = [{
         self.waitForElementVisible('@progressBar');
         // when we are loading the code element should not be present
         this.expect.element('@code').to.not.be.present.before(1000);
+        return self;
 
     },
     /*
@@ -267,7 +268,6 @@ module.exports.commands = [{
         self.waitForElementVisible('@logConsole');
         const selector = '.logConsole';
         return notEmptyHelper(selector, self, expectedMinimum);
-        return self;
     },
     /*
      * validate that the log console is present
@@ -414,8 +414,8 @@ module.exports.commands = [{
             // the scrollHeight has to be higher 0 to indicate that we have scrolled
             browser.assert.equal(result.value > 0, true);
             // to make component chain-able we will return self - part 2
-            return self;
         });
+        return self;
     }
 
 }];
diff --git a/src/test/js/log-karaoke/stages.js b/src/test/js/log-karaoke/stages.js
@@ -133,7 +133,7 @@ module.exports = {
             const blueRunDetailPage = browser.page.bluePipelineRunDetail().forRun(useCase.name, 'jenkins', 1);
             blueRunDetailPage.clickTab('artifacts');
             blueRunDetailPage
-                .validateNotEmptyArtifacts(browser, 1)
+                .validateNotEmptyArtifacts(1)
                 .waitForElementVisible('@artifactTable', createCallbackWrapper(callback));
         }, function(err, results) {
             // Check whether the changes tab shows emptyState for only one case