Fix flaky GitLab await ready by using PageObject (and adapt to new Credentials) (jenkinsci#2608)

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

Author: 3 people

src/main/java/org/jenkinsci/test/acceptance/docker/fixtures/GitLabContainer.java

@@ -1,11 +1,14 @@
 package org.jenkinsci.test.acceptance.docker.fixtures;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.time.Duration;
 import org.jenkinsci.test.acceptance.docker.Docker;
 import org.jenkinsci.test.acceptance.docker.DockerContainer;
 import org.jenkinsci.test.acceptance.docker.DockerFixture;
 import org.jenkinsci.test.acceptance.po.CapybaraPortingLayerImpl;
+import org.openqa.selenium.WebDriverException;
 
 @DockerFixture(
         id = "gitlab-plugin",
@@ -53,15 +56,16 @@ public String extractProjectPath(String repoUrl) {
         return afterAuth.split("/", 2)[1].replace(".git", "");
     }
 
-    public void waitForReady(CapybaraPortingLayerImpl p) {
+    public void waitForReady(CapybaraPortingLayerImpl p) throws MalformedURLException {
+        GitLabPage gitLabPage = new GitLabPage(p.injector, new URL(getHttpUrl()));
         p.waitFor()
                 .withMessage("Waiting for GitLab to come up")
                 .withTimeout(READINESS_TIMEOUT)
                 .pollingEvery(READINESS_POLL_INTERVAL)
+                .ignoring(WebDriverException.class) // connection reset while not up
                 .until(() -> {
-                    p.executeScript("window.location.href = arguments[0];", getHttpUrl());
-                    var page = p.getPageSource();
-                    return page != null && page.contains("GitLab Community Edition");
+                    gitLabPage.open();
+                    return gitLabPage.isReady();
                 });
     }
 

src/main/java/org/jenkinsci/test/acceptance/docker/fixtures/GitLabPage.java

@@ -0,0 +1,17 @@
+package org.jenkinsci.test.acceptance.docker.fixtures;
+
+import com.google.inject.Injector;
+import java.net.URL;
+import org.jenkinsci.test.acceptance.po.PageObject;
+
+/** Wait for GitLab landing page */
+public class GitLabPage extends PageObject {
+    public GitLabPage(Injector injector, URL url) {
+        super(injector, url);
+    }
+
+    public boolean isReady() {
+        var page = getPageSource();
+        return page != null && page.contains("GitLab Community Edition");
+    }
+}

src/main/java/org/jenkinsci/test/acceptance/plugins/gitlab_plugin/GitLabPersonalAccessTokenCredential.java

@@ -1,7 +1,5 @@
 package org.jenkinsci.test.acceptance.plugins.gitlab_plugin;
 
-import static org.jenkinsci.test.acceptance.Matchers.hasContent;
-
 import org.jenkinsci.test.acceptance.plugins.credentials.BaseStandardCredentials;
 import org.jenkinsci.test.acceptance.po.Control;
 import org.jenkinsci.test.acceptance.po.Describable;
@@ -24,9 +22,4 @@ public GitLabPersonalAccessTokenCredential(PageAreaImpl area, String relativePat
     public void setToken(String gitLabToken) {
         token.set(gitLabToken);
     }
-
-    public void create() {
-        control(by.path("/Submit")).click();
-        waitFor(driver, hasContent("Global credentials"), 2);
-    }
 }

src/test/java/plugins/GitLabPluginTest.java

@@ -52,7 +52,6 @@
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.openqa.selenium.NoSuchElementException;
@@ -200,7 +199,6 @@ public static void tearDownGitLabContainer() {
      * Verifies multibranch pipeline discovers branches/MRs/tags, builds them, and detects dynamic branch
      */
     @Test
-    @Ignore("https://github.com/jenkinsci/acceptance-test-harness/issues/1461")
     public void testGitLabMultibranchPipeline() throws IOException {
         // Given a repository with 4 branches (3 valid, 1 broken) and 1 merge request
         Project project;
@@ -303,7 +301,6 @@ public void testGitLabMultibranchPipeline() throws IOException {
      * Verifies organization folder discovers group projects and indexes their branches/MRs.
      */
     @Test
-    @Ignore("https://github.com/jenkinsci/acceptance-test-harness/issues/1461")
     public void gitLabGroupFolderOrganization() throws IOException {
         // Given a GitLab group with 2 projects, each with 4 branches and 1 merge request
         try (var gitlabapi = new GitLabApi(CONTAINER.getHttpUrl(), ADMIN_TOKEN)
@@ -394,7 +391,7 @@ private void createGitLabToken(String token, String id) {
         var tk = cp.add(GitLabPersonalAccessTokenCredential.class);
         tk.setToken(token);
         tk.setId(id);
-        tk.create();
+        cp.create();
     }
 
     private void configureGitLabServer() throws IOException {