chore(e2e): retries for bulk import test (#3367)

* chore(e2e): retries for repo filtering

* Skip if already added

* Logging

* Revert

* Dynamically create the repository

* Update bulk-import.spec.ts

Author: zdrapela

e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts

@@ -17,21 +17,26 @@ test.describe.serial("Bulk Import plugin", () => {
   let uiHelper: UIhelper;
   let common: Common;
 
-  test.beforeAll(async () => {
-    test.info().annotations.push({
-      type: "component",
-      description: "plugins",
-    });
-  });
-
   let bulkimport: BulkImport;
 
+  const catalogRepoName = `janus-test-1-bulk-import-test-${Date.now()}`;
   const catalogRepoDetails = {
-    name: "janus-test-1-bulk-import-test",
-    url: "github.com/janus-test/janus-test-1-bulk-import-test",
+    name: catalogRepoName,
+    url: `github.com/janus-test/${catalogRepoName}`,
     org: "github.com/janus-test",
     owner: "janus-test",
   };
+
+  const catalogInfoYamlContent = `apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: ${catalogRepoName}
+  annotations:
+    github.com/project-slug: janus-test/${catalogRepoName}
+spec:
+  type: other
+  lifecycle: unknown
+  owner: user:default/rhdh-qe-2`;
   const newRepoName = `bulk-import-${Date.now()}`;
   const newRepoDetails = {
     owner: "janus-test",
@@ -40,13 +45,27 @@ test.describe.serial("Bulk Import plugin", () => {
     labels: `bulkimport1: test1;bulkimport2: test2`,
     repoUrl: `github.com/janus-test/${newRepoName}`,
   };
+
   test.beforeAll(async ({ browser }, testInfo) => {
+    test.info().annotations.push({
+      type: "component",
+      description: "plugins",
+    });
+
     page = (await setupBrowser(browser, testInfo)).page;
 
     uiHelper = new UIhelper(page);
     common = new Common(page);
     bulkimport = new BulkImport(page);
 
+    // Create the repository with catalog-info.yaml file dynamically
+    await APIHelper.createGitHubRepoWithFile(
+      catalogRepoDetails.owner,
+      catalogRepoDetails.name,
+      "catalog-info.yaml",
+      catalogInfoYamlContent,
+    );
+
     await bulkimport.newGitHubRepo(
       newRepoDetails.owner,
       newRepoDetails.repoName,
@@ -62,6 +81,7 @@ test.describe.serial("Bulk Import plugin", () => {
     await uiHelper.openSidebar("Bulk import");
     await uiHelper.clickButton("Add");
     await uiHelper.searchInputPlaceholder(catalogRepoDetails.name);
+
     await uiHelper.verifyRowInTableByUniqueText(catalogRepoDetails.name, [
       "Not Generated",
     ]);
@@ -234,10 +254,25 @@ test.describe.serial("Bulk Import plugin", () => {
   });
 
   test.afterAll(async () => {
-    await APIHelper.deleteGitHubRepo(
-      newRepoDetails.owner,
-      newRepoDetails.repoName,
-    );
+    try {
+      // Delete the dynamically created GitHub repository with catalog-info.yaml
+      await APIHelper.deleteGitHubRepo(
+        catalogRepoDetails.owner,
+        catalogRepoDetails.name,
+      );
+
+      // Delete the GitHub repository
+      await APIHelper.deleteGitHubRepo(
+        newRepoDetails.owner,
+        newRepoDetails.repoName,
+      );
+
+      console.log(
+        `[Cleanup] Deleted GitHub repositories: ${catalogRepoDetails.name}, ${newRepoDetails.repoName}`,
+      );
+    } catch (error) {
+      console.error(`[Cleanup] Final cleanup failed: ${error.message}`);
+    }
   });
 });
 

e2e-tests/playwright/support/pages/bulk-import.ts

@@ -17,9 +17,23 @@ export class BulkImport {
   }
 
   async filterAddedRepo(searchText: string) {
-    await this.page
-      .getByPlaceholder("Filter", { exact: true })
-      .fill(searchText);
+    await expect(async () => {
+      // Clear any existing filter first
+      await this.page.getByPlaceholder("Filter", { exact: true }).clear();
+
+      // Fill the filter with search text
+      await this.page
+        .getByPlaceholder("Filter", { exact: true })
+        .fill(searchText);
+
+      // Wait for the filter to be applied and verify no "no-import-jobs-found" message appears
+      await expect(this.page.getByTestId("no-import-jobs-found")).toBeHidden({
+        timeout: 2000,
+      });
+    }).toPass({
+      intervals: [1_000, 2_000, 5_000],
+      timeout: 15_000,
+    });
   }
 
   async newGitHubRepo(owner: string, repoName: string) {

e2e-tests/playwright/utils/api-helper.ts

@@ -76,6 +76,46 @@ export class APIHelper {
     expect(response.status() === 201 || response.ok()).toBeTruthy();
   }
 
+  static async createGitHubRepoWithFile(
+    owner: string,
+    repoName: string,
+    filename: string,
+    fileContent: string,
+  ) {
+    // Create the repository
+    await APIHelper.createGitHubRepo(owner, repoName);
+
+    // Add the specified file
+    await APIHelper.createFileInRepo(
+      owner,
+      repoName,
+      filename,
+      fileContent,
+      `Add ${filename} file`,
+    );
+  }
+
+  static async createFileInRepo(
+    owner: string,
+    repoName: string,
+    filePath: string,
+    content: string,
+    commitMessage: string,
+    branch = "main",
+  ) {
+    const encodedContent = Buffer.from(content).toString("base64");
+    const response = await APIHelper.githubRequest(
+      "PUT",
+      `${GITHUB_API_ENDPOINTS.contents(owner, repoName)}/${filePath}`,
+      {
+        message: commitMessage,
+        content: encodedContent,
+        branch: branch,
+      },
+    );
+    expect(response.status() === 201 || response.ok()).toBeTruthy();
+  }
+
   static async initCommit(owner: string, repo: string, branch = "main") {
     const content = Buffer.from(
       "This is the initial commit for the repository.",