Forward compatibility for Redesign the Jenkins header (#1917)

Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>

Author: janfaracik

src/test/java/core/FormValidationTest.java

@@ -75,8 +75,8 @@ private void jsValidation() {
     }
 
     private void navigateAway() {
-        jenkins.runThenConfirmAlert(() -> driver.findElement(By.xpath("//ol[@id=\"breadcrumbs\"]/li[1]/a"))
-                .click());
+        jenkins.runThenConfirmAlert(
+                () -> driver.findElement(By.id("jenkins-head-icon")).click());
         sleep(1000); // Needed for some reason
     }
 }

src/test/java/core/PublisherOrderTest.java

@@ -65,8 +65,8 @@ public void testUnordered() {
          * Navigate back to the dashboard first to dismiss the alert so that CspRule can check for violations (see
          * FormValidationTest).
          */
-        jenkins.runThenConfirmAlert(() -> driver.findElement(By.xpath("//ol[@id=\"breadcrumbs\"]/li[1]/a"))
-                .click());
+        jenkins.runThenConfirmAlert(
+                () -> driver.findElement(By.id("jenkins-head-icon")).click());
         sleep(1000);
     }
 }

src/test/java/plugins/ArtifactoryPluginTest.java

@@ -71,8 +71,8 @@ public void check_config_is_persisted() {
          * Navigate back to the dashboard first to dismiss the alert so that CspRule can check for violations (see
          * FormValidationTest).
          */
-        jenkins.runThenConfirmAlert(() -> driver.findElement(By.xpath("//ol[@id=\"breadcrumbs\"]/li[1]/a"))
-                .click());
+        jenkins.runThenConfirmAlert(
+                () -> driver.findElement(By.id("jenkins-head-icon")).click());
         sleep(1000);
     }
 

src/test/java/plugins/DashboardViewPluginTest.java

@@ -3,7 +3,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalToIgnoringCase;
-import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.jenkinsci.test.acceptance.Matchers.hasContent;
 import static org.junit.Assert.assertEquals;
@@ -208,7 +207,6 @@ public void configureDashboardNameAndDescription() {
         assertThat(url, endsWith(name + "/"));
 
         final List<String> breadCrumbs = v.breadCrumbs.getBreadCrumbs();
-        assertThat(breadCrumbs, hasSize(2));
         final String nameCrumb = breadCrumbs.get(breadCrumbs.size() - 1);
         assertThat(nameCrumb, is(name));
 

src/test/java/plugins/MailerPluginTest.java

@@ -47,8 +47,8 @@ public void send_test_mail() throws IOException {
          * Navigate back to the dashboard first to dismiss the alert so that CspRule can check for violations (see
          * FormValidationTest).
          */
-        jenkins.runThenConfirmAlert(() -> driver.findElement(By.xpath("//ol[@id=\"breadcrumbs\"]/li[1]/a"))
-                .click());
+        jenkins.runThenConfirmAlert(
+                () -> driver.findElement(By.id("jenkins-head-icon")).click());
         sleep(1000);
     }
 

src/test/java/plugins/PlainCredentialsBindingTest.java

@@ -75,8 +75,8 @@ public void systemSecretFileCredentialTest() throws URISyntaxException {
          * Navigate back to the dashboard first to dismiss the alert so that CspRule can check for violations (see
          * FormValidationTest).
          */
-        jenkins.runThenConfirmAlert(() -> driver.findElement(By.xpath("//ol[@id=\"breadcrumbs\"]/li[1]/a"))
-                .click());
+        jenkins.runThenConfirmAlert(
+                () -> driver.findElement(By.id("jenkins-head-icon")).click());
         sleep(1000);
     }
 
@@ -88,8 +88,8 @@ public void systemSecretTextCredentialTest() throws URISyntaxException {
          * Navigate back to the dashboard first to dismiss the alert so that CspRule can check for violations (see
          * FormValidationTest).
          */
-        jenkins.runThenConfirmAlert(() -> driver.findElement(By.xpath("//ol[@id=\"breadcrumbs\"]/li[1]/a"))
-                .click());
+        jenkins.runThenConfirmAlert(
+                () -> driver.findElement(By.id("jenkins-head-icon")).click());
         sleep(1000);
     }
 

src/test/java/plugins/SshSlavesPluginTest.java

@@ -152,8 +152,8 @@ public void newSlaveWithExistingCredential() throws Exception {
          * Navigate back to the dashboard first to dismiss the alert so that CspRule can check for violations (see
          * FormValidationTest).
          */
-        jenkins.runThenConfirmAlert(() -> driver.findElement(By.xpath("//ol[@id=\"breadcrumbs\"]/li[1]/a"))
-                .click());
+        jenkins.runThenConfirmAlert(
+                () -> driver.findElement(By.id("jenkins-head-icon")).click());
         sleep(1000);
     }