fix(tests): fixed oversights in e2e tests

Signed-off-by: Rostislav Lán <[email protected]>

Author: rostalan

.github/workflows/pr-build-extension.yaml

@@ -23,7 +23,7 @@ on:
     branches: [ 'main' ]
 
 jobs:
-  build-extension:
+  pr-build-extension:
     name: Build OCI image
     runs-on: ubuntu-24.04
     steps:

.gitignore

@@ -2,3 +2,4 @@
 node_modules
 test-results
 output
+dist

podman-desktop-extension/tests/src/image-checker.spec.ts

@@ -34,7 +34,7 @@ const extensionLabel = 'redhat.openshift-checker';
 const extensionLabelName = 'openshift-checker';
 const activeExtensionStatus = 'ACTIVE';
 const disabledExtensionStatus = 'DISABLED';
-const imageToCheck = 'docker.io/library/httpd';
+const imageToCheck = 'ghcr.io/linuxcontainers/alpine';
 const isLinux = process.platform === 'linux';
 const providerName = 'Red Hat OpenShift Checker';
 const extensionName = 'Red Hat OpenShift Checker extension';
@@ -50,11 +50,8 @@ test.beforeAll(async ({ runner, page, welcomePage }) => {
 
 test.afterAll(async ({ runner, page }) => {
   test.setTimeout(60000);
-  try {
-    deleteImage(page, imageToCheck);
-  } finally {
-    await runner.close();
-  }
+  deleteImage(page, imageToCheck);
+  await runner.close();
 });
 
 test.describe.serial('Red Hat Image Checker extension installation', () => {
@@ -67,7 +64,7 @@ test.describe.serial('Red Hat Image Checker extension installation', () => {
 
   test('Remove old version of the extension', async ({ navigationBar }) => {
     test.skip(!extensionInstalled);
-    await removeExtension(navigationBar);
+    await disableAndRemoveExtension(navigationBar);
   });
 
   test('Extension can be installed from an OCI image', async ({ navigationBar }) => {
@@ -106,12 +103,12 @@ test.describe.serial('Red Hat Image Checker extension installation', () => {
 
 test.describe.serial('Red Hat Image Checker extension functionality', () => {
   test('Pull testing image, check tab is present in image details page', async ({ navigationBar }) => {
-    let imagesPage = await navigationBar.openImages();
+    const imagesPage = await navigationBar.openImages();
     await playExpect(imagesPage.heading).toBeVisible();
 
     const pullImagePage = await imagesPage.openPullImage();
     await playExpect(pullImagePage.heading).toBeVisible();
-    imagesPage = await pullImagePage.pullImage(imageToCheck);
+    await pullImagePage.pullImage(imageToCheck);
     const imageDetailsPage = await getImageDetailsPage(navigationBar);
     await playExpect(imageDetailsPage.imageCheckerTab).toBeVisible();
 
@@ -145,7 +142,7 @@ test.describe.serial('Red Hat Image Checker extension functionality', () => {
     await playExpect(imageDetailsPage.imageCheckerTabContent).toBeVisible();
 
     // wait for the analysis to be complete
-    const analysisStatus = await imageDetailsPage.getAnalysisStatus();
+    const analysisStatus = imageDetailsPage.analysisStatus;
     await playExpect(analysisStatus).toBeVisible();
     await playExpect
       .poll(async () => await analysisStatus.innerText(), { timeout: 60000 })
@@ -183,7 +180,9 @@ test.describe.serial('Red Hat Image Checker extension functionality', () => {
 test.describe.serial('Red Hat Image Checker extension handling', () => {
   test('Extension can be disabled', async ({ navigationBar }) => {
     const extensions = await navigationBar.openExtensions();
-    playExpect(extensions.extensionIsInstalled(extensionLabel)).toBeTruthy();
+    await playExpect
+    .poll(async () => await extensions.extensionIsInstalled(extensionLabel), { timeout: 15000 })
+    .toBeTruthy();    
     const extensionCard = await extensions.getInstalledExtension(extensionLabelName, extensionLabel);
     await extensionCard.disableExtension();
     await playExpect(extensionCard.status).toHaveText(disabledExtensionStatus);
@@ -193,7 +192,9 @@ test.describe.serial('Red Hat Image Checker extension handling', () => {
 
   test('Extension can be re-enabled', async ({ navigationBar }) => {
     const extensions = await navigationBar.openExtensions();
-    playExpect(extensions.extensionIsInstalled(extensionLabel)).toBeTruthy();
+    await playExpect
+    .poll(async () => await extensions.extensionIsInstalled(extensionLabel), { timeout: 15000 })
+    .toBeTruthy();
     const extensionCard = await extensions.getInstalledExtension(extensionLabelName, extensionLabel);
     await extensionCard.enableExtension();
     await playExpect(extensionCard.status).toHaveText(activeExtensionStatus);
@@ -202,14 +203,15 @@ test.describe.serial('Red Hat Image Checker extension handling', () => {
   });
 
   test('Extension can be removed', async ({ navigationBar }) => {
-    await removeExtension(navigationBar);
+    await disableAndRemoveExtension(navigationBar);
   });
 });
 
-async function removeExtension(navigationBar: NavigationBar): Promise<void> {
+async function disableAndRemoveExtension(navigationBar: NavigationBar): Promise<void> {
   const extensions = await navigationBar.openExtensions();
   const extensionCard = await extensions.getInstalledExtension(extensionLabelName, extensionLabel);
-  await extensionCard.disableExtension();
+  playExpect(extensionCard.status).toHaveText(activeExtensionStatus);
+  await playExpect(extensionCard.removeButton).toBeVisible();
   await extensionCard.removeExtension();
   await playExpect
     .poll(async () => await extensions.extensionIsInstalled(extensionLabel), { timeout: 15000 })