diff --git a/.ibm/pipelines/auth/secrets-rhdh-secrets.yaml b/.ibm/pipelines/auth/secrets-rhdh-secrets.yaml index a283be993..8e1c054b3 100644 --- a/.ibm/pipelines/auth/secrets-rhdh-secrets.yaml +++ b/.ibm/pipelines/auth/secrets-rhdh-secrets.yaml @@ -10,7 +10,8 @@ data: GITHUB_APP_CLIENT_SECRET: dGVtcA== GITHUB_APP_WEBHOOK_URL: aHR0cHM6Ly9zbWVlLmlvL0NrRUNLYVgwNzhyZVhobEpEVzA= GITHUB_APP_WEBHOOK_SECRET: dGVtcA== - GITHUB_ORG_URL: aHR0cHM6Ly9naXRodWIuY29tL2phbnVzLXFl + GITHUB_URL: aHR0cHM6Ly9naXRodWIuY29t + GITHUB_ORG: amFudXMtcWU= K8S_CLUSTER_NAME: Y2k1aGp2ZmYwMG8yZzY2OXZxOGc= K8S_CLUSTER_API_SERVER_URL: aHR0cHM6Ly9jMTE0LWUuZXUtZGUuY29udGFpbmVycy5jbG91ZC5pYm0uY29tOjMxNTA2 K8S_SERVICE_ACCOUNT_TOKEN: dGVtcA== diff --git a/e2e-tests/playwright/e2e/plugins/dynamic-plugins-info.spec.ts b/e2e-tests/playwright/e2e/plugins/dynamic-plugins-info.spec.ts index 1cf0095ea..e6006f5ac 100644 --- a/e2e-tests/playwright/e2e/plugins/dynamic-plugins-info.spec.ts +++ b/e2e-tests/playwright/e2e/plugins/dynamic-plugins-info.spec.ts @@ -18,7 +18,10 @@ test.describe('dynamic-plugins-info backend plugin', () => { resPlugin.platform === plugin.platform, ); - expect(isPluginIncluded).toBeTruthy(); + expect( + isPluginIncluded, + `Plugin not found: ${JSON.stringify(plugin)}`, + ).toBeTruthy(); } }); }); diff --git a/e2e-tests/playwright/e2e/plugins/ocm.spec.ts b/e2e-tests/playwright/e2e/plugins/ocm.spec.ts index 4c28d3cca..940861c69 100644 --- a/e2e-tests/playwright/e2e/plugins/ocm.spec.ts +++ b/e2e-tests/playwright/e2e/plugins/ocm.spec.ts @@ -18,13 +18,14 @@ let page: Page; test.describe.serial('Test OCM plugin', () => { let uiHelper: UIhelper; let clusters: Clusters; + let common: Common; test.beforeAll(async ({ browserName }) => { const browserType = browserName === 'firefox' ? firefox : chromium; const browser = await browserType.launch(); page = await browser.newPage(); - const common = new Common(page); + common = new Common(page); uiHelper = new UIhelper(page); clusters = new Clusters(page); @@ -54,6 +55,7 @@ test.describe.serial('Test OCM plugin', () => { test('Navigate to Catalog > resources and verify cluster', async () => { await uiHelper.openSidebar('Catalog'); + await common.waitForLoad(); await uiHelper.selectMuiBox('Kind', 'Resource'); await uiHelper.verifyRowsInTable([clusterDetails.clusterName]); await uiHelper.clickLink(clusterDetails.clusterName); diff --git a/e2e-tests/playwright/support/pageObjects/global-obj.ts b/e2e-tests/playwright/support/pageObjects/global-obj.ts index 719ddfe00..8397f33d6 100644 --- a/e2e-tests/playwright/support/pageObjects/global-obj.ts +++ b/e2e-tests/playwright/support/pageObjects/global-obj.ts @@ -11,5 +11,5 @@ export const UIhelperPO = { MuiCard: cardHeading => `//div[contains(@class,'MuiCardHeader-root') and descendant::*[text()='${cardHeading}']]/..`, tabs: '[role="tab"]', - rowByText: (text: string) => `tr:has(td:text-is("${text}"))`, + rowByText: (text: string) => `tr:has(:text-is("${text}"))`, }; diff --git a/e2e-tests/playwright/support/testData/dynamic-plugins-info.ts b/e2e-tests/playwright/support/testData/dynamic-plugins-info.ts index c03f6636a..4c420dd2d 100644 --- a/e2e-tests/playwright/support/testData/dynamic-plugins-info.ts +++ b/e2e-tests/playwright/support/testData/dynamic-plugins-info.ts @@ -22,7 +22,7 @@ export const plugins = [ { name: 'backstage-plugin-kubernetes-backend-dynamic', platform: 'node', - role: 'backend-plugin-module', + role: 'backend-plugin', }, { name: 'roadiehq-scaffolder-backend-module-utils-dynamic',