Skip to content

Commit c102631

Browse files
committed
fix ci issues
Signed-off-by: Yi Cai <yicai@redhat.com>
1 parent 755347f commit c102631

File tree

5 files changed

+39
-16
lines changed

5 files changed

+39
-16
lines changed

workspaces/orchestrator/plugins/orchestrator-backend/src/service/api/mapping/V2Mappings.test.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ describe('scenarios to verify mapToProcessInstanceDTO', () => {
118118
const end = DateTime.fromISO(processIntanceV1.end as string, {
119119
setZone: true,
120120
});
121-
const duration = Duration.fromMillis(end.diff(start).toMillis())
122-
.rescale()
123-
.toHuman();
121+
const duration = Duration.fromMillis(end.diff(start).toMillis()).toHuman();
124122
// Act
125123
const result = mapToProcessInstanceDTO(processIntanceV1);
126124

workspaces/orchestrator/plugins/orchestrator-backend/src/service/api/mapping/V2Mappings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export function mapToProcessInstanceDTO(
9494
setZone: true,
9595
});
9696
const duration = processInstance.end
97-
? Duration.fromMillis(end.diff(start).toMillis()).rescale().toHuman()
97+
? Duration.fromMillis(end.diff(start).toMillis()).toHuman()
9898
: undefined;
9999

100100
let variables: Record<string, unknown> | undefined;

workspaces/orchestrator/plugins/scaffolder-backend-module-orchestrator/src/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
coreServices,
1818
createBackendModule,
1919
} from '@backstage/backend-plugin-api';
20-
import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
20+
import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
2121

2222
import {
2323
createGetWorkflowParamsAction,

workspaces/quickstart/packages/app/e2e-tests/quick-start-admin-guest.spec.ts

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,53 @@ test.describe('Test Quick Start plugin', () => {
6161
},
6262
);
6363

64-
await page.getByText(translations.steps.setupAuthentication.title).click();
64+
// Click and verify setupAuthentication step
65+
const setupAuthStep = page.getByText(
66+
translations.steps.setupAuthentication.title,
67+
);
68+
await setupAuthStep.click();
69+
// Wait for the step content to be visible
70+
await page
71+
.getByText(translations.steps.setupAuthentication.description)
72+
.waitFor({ state: 'visible' });
6573
await uiHelper.verifyButtonURL(
6674
translations.steps.setupAuthentication.ctaTitle,
6775
'https://docs.redhat.com/en/documentation/red_hat_developer_hub/latest/html/authentication_in_red_hat_developer_hub/',
6876
{ exact: false },
6977
);
70-
await page.getByText(translations.steps.configureRbac.title).click();
78+
79+
// Click and verify configureRbac step
80+
const configureRbacStep = page.getByText(
81+
translations.steps.configureRbac.title,
82+
);
83+
await configureRbacStep.click();
84+
await page
85+
.getByText(translations.steps.configureRbac.description)
86+
.waitFor({ state: 'visible' });
7187
await uiHelper.verifyButtonURL(
7288
translations.steps.configureRbac.ctaTitle,
7389
'/rbac',
7490
);
91+
92+
// Click and verify configureGit step
93+
// This is critical: both setupAuthentication and configureGit have the same CTA text "En savoir plus" in French
94+
// So we need to ensure we're getting the button from the configureGit step, not the setupAuthentication step
7595
await page.getByText(translations.steps.configureGit.title).click();
76-
await uiHelper.verifyButtonURL(
77-
translations.steps.configureGit.ctaTitle,
96+
// Wait for the configureGit step description to be visible to ensure the step has expanded
97+
const configureGitDescription = page.getByText(
98+
translations.steps.configureGit.description,
99+
);
100+
await configureGitDescription.waitFor({ state: 'visible' });
101+
// Find the button that's in the same parent container as the configureGit description
102+
// This ensures we get the button from the configureGit step, not from setupAuthentication
103+
const configureGitButton = configureGitDescription
104+
.locator('..')
105+
.locator('..')
106+
.getByRole('button', { name: translations.steps.configureGit.ctaTitle })
107+
.first();
108+
const href = await configureGitButton.getAttribute('href');
109+
expect(href).toContain(
78110
'https://docs.redhat.com/en/documentation/red_hat_developer_hub/latest/html/integrating_red_hat_developer_hub_with_github/',
79-
{ exact: false },
80111
);
81112
await page.getByText(translations.steps.managePlugins.title).click();
82113
await uiHelper.verifyButtonURL(

workspaces/scorecard/plugins/scorecard/src/translations/fr.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ const scorecardTranslationFr = createTranslationMessages({
5151
'thresholds.success': 'Succès',
5252
'thresholds.warning': 'Attention',
5353
'thresholds.error': 'Erreur',
54-
'metric.github.open-prs.title': 'GitHub ouvre des PR',
55-
'metric.github.open-prs.description':
56-
"Nombre actuel de requêtes d'extraction ouvertes pour un référentiel GitHub donné.",
57-
'metric.jira.open-issues.title': 'Jira ouvre des tickets bloquants',
58-
'metric.jira.open-issues.description':
59-
'Met en évidence le nombre de problèmes critiques et bloquants actuellement ouverts dans Jira.',
6054
},
6155
});
6256

0 commit comments

Comments
 (0)