[JENKINS-40662] add a test case for when user is deep-linked to run d…

…etails in the URL form of :org/:pipeline/:branch/:runId and the modal doesn't close properly
jenkinsci · Jan 3, 2017 · a7765b9 · a7765b9
1 parent e703781
commit a7765b9
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 9 deletions.
diff --git a/src/main/js/page_objects/blueocean/bluePipelineRunDetail.js b/src/main/js/page_objects/blueocean/bluePipelineRunDetail.js
@@ -143,21 +143,20 @@ module.exports.commands = [{
     },
    /**
      * Close the modal view
+     * @param {String} [urlFragment] expected URL fragment to test for after close.
      * @returns {Object} self - nightwatch page object
      */
-    closeModal: function () {
+    closeModal: function (urlFragment) {
         const self = this;
         const browser = self.api;
         self.waitForElementVisible('@closeButton');
         self.click('@closeButton');
-        browser.url(function (response) {
-            sanityCheck(self, response);
-            // FIXME JENKINS-36619 -> somehow the close in AT is not working as it should
-            // I debugged a bit and found out that the "previous" location is the same as
-            // current, this is the reason, why no url change is triggered. The question remains
-            // why that is happening
-            // this.pause(10000)
-        });
+
+        if (urlFragment) {
+            self.waitForLocationChange();
+            browser.assert.urlContains(urlFragment);
+        }
+
         return self;
     },
     /**

diff --git a/src/test/js/edgeCases/runDetailsDeepLink.js b/src/test/js/edgeCases/runDetailsDeepLink.js
@@ -0,0 +1,38 @@
+/**
+ * @module runDetailsDeepLink
+ * @memberof edgeCases
+ * @description
+ *
+ * Tests: test whether navigating to Run Details without specifying a tab allows the close button to work correctly.
+ *
+ * REGRESSION covered:
+ *
+ * @see {@link https://issues.jenkins-ci.org/browse/JENKINS-40662|JENKINS-40662} Deep-linking to Run Details
+ * screen with no tab specified causes problem when closing modal
+ */
+const jobName = 'runDetailsDeepLink';
+module.exports = {
+    /** Create Pipeline Job "runDetailsDeepLink" */
+    'Step 01': function (browser) {
+        const pipelinesCreate = browser.page.pipelineCreate().navigate();
+        pipelinesCreate.createPipeline(jobName, 'initialStage.groovy');
+    },
+    /** Build Pipeline Job*/
+    'Step 02': function (browser) {
+        const pipelinePage = browser.page.jobUtils().forJob(jobName);
+        pipelinePage.buildStarted(function () {
+            // Reload the job page and check that there was a build done.
+            pipelinePage
+                .waitForElementVisible('div#pipeline-box')
+                .forRun(1)
+                .waitForElementVisible('@executer');
+        });
+    },
+    /** Check Job Blue Ocean Pipeline Activity Page has run */
+    'Step 03': function (browser) {
+        const blueActivityPage = browser.page.bluePipelineActivity().forJob(jobName, 'jenkins');
+        blueActivityPage.waitForRunRunningVisible(jobName + '-1');
+        const blueRunDetailPage = browser.page.bluePipelineRunDetail().forRun(jobName, 'jenkins', 1);
+        blueRunDetailPage.closeModal('/activity');
+    },
+};