Skip to content

Commit edb24a5

Browse files
authored
fixed gen ai e2e test (opendatahub-io#6232)
* fixed gen ai e2e test * remove test from quarantine * added NonConcurrent tag to Gen AI tests * Removed Bug tags in gen ai e2e test
1 parent a076001 commit edb24a5

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

packages/cypress/cypress/pages/genAiPlayground.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class GenAiPlayground {
2121
}
2222

2323
findModelToggleButton() {
24-
return cy.findByTestId('model-selector-toggle');
24+
return cy.findByTestId('chatbot-model-selector-toggle');
2525
}
2626

2727
findMessageInput() {

packages/cypress/cypress/tests/e2e/gen-ai/testGenAi.cy.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
createCleanHardwareProfile,
3131
} from '../../../utils/oc_commands/hardwareProfiles';
3232

33-
describe('[Automation Bug: RHOAIENG-49259] Verify Gen AI Namespace - Creation and Connection', () => {
33+
describe('Verify Gen AI Namespace - Creation and Connection', () => {
3434
let testData: GenAiTestData;
3535
let projectName: string;
3636
let skipTest = false;
@@ -126,7 +126,7 @@ describe('[Automation Bug: RHOAIENG-49259] Verify Gen AI Namespace - Creation an
126126
it(
127127
'Create custom serving runtime for Gen AI',
128128
{
129-
tags: ['@Sanity', '@SanitySet1', '@GenAI', '@ServingRuntime', '@Bug'],
129+
tags: ['@Sanity', '@SanitySet1', '@GenAI', '@ServingRuntime', '@NonConcurrent'],
130130
},
131131
() => {
132132
if (skipTest) {
@@ -175,7 +175,7 @@ describe('[Automation Bug: RHOAIENG-49259] Verify Gen AI Namespace - Creation an
175175
it(
176176
'Deploy Gen AI model using URI',
177177
{
178-
tags: ['@Sanity', '@SanitySet1', '@GenAI', '@ModelServing', '@Deployment', '@Bug'],
178+
tags: ['@Sanity', '@SanitySet1', '@GenAI', '@ModelServing', '@Deployment', '@NonConcurrent'],
179179
},
180180
() => {
181181
if (skipTest) {
@@ -253,7 +253,7 @@ describe('[Automation Bug: RHOAIENG-49259] Verify Gen AI Namespace - Creation an
253253
it(
254254
'Create and verify Gen AI Playground functionality',
255255
{
256-
tags: ['@Sanity', '@SanitySet1', '@GenAI', '@Playground', '@Bug'],
256+
tags: ['@Sanity', '@SanitySet1', '@GenAI', '@Playground', '@NonConcurrent'],
257257
},
258258
() => {
259259
if (skipTest) {

packages/gen-ai/frontend/src/__tests__/cypress/cypress/pages/chatbotPage.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ class ChatbotPage {
147147

148148
// Model Selection
149149
// Model dropdown is now in the toolbar (moved from Model tab)
150-
// Note: There may be multiple model dropdowns (header + settings panel), so use .first()
150+
// Use specific test ID for chatbot header model selector
151151
findModelDropdown(): Cypress.Chainable<JQuery<HTMLElement>> {
152-
return cy.findAllByTestId('model-selector-toggle').first();
152+
return cy.findByTestId('chatbot-model-selector-toggle');
153153
}
154154

155155
findModelSelectorButton(): Cypress.Chainable<JQuery<HTMLElement>> {
156-
return cy.findAllByTestId('model-selector-toggle').first();
156+
return cy.findByTestId('chatbot-model-selector-toggle');
157157
}
158158

159159
verifyModelSelected(): void {
@@ -422,7 +422,7 @@ class ChatbotPage {
422422

423423
// Find pane model selector by pane index
424424
findPaneModelSelector(index: number): Cypress.Chainable<JQuery<HTMLElement>> {
425-
return this.findChatbotPaneByIndex(index).findByTestId('model-selector-toggle');
425+
return this.findChatbotPaneByIndex(index).findByTestId('chatbot-model-selector-toggle');
426426
}
427427

428428
// Find pane label text (e.g., "Model 1", "Model 2")

packages/gen-ai/frontend/src/__tests__/cypress/cypress/tests/mocked/chatbot/compareMode.cy.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@ describe('Chatbot - Compare Mode (Mocked)', () => {
8282
cy.wait('@aaModels');
8383

8484
// Verify model is selected
85-
cy.findAllByTestId('model-selector-toggle')
86-
.first()
87-
.should('be.visible')
88-
.and('contain', 'Llama');
85+
cy.findByTestId('chatbot-model-selector-toggle').should('be.visible').and('contain', 'Llama');
8986
});
9087

9188
afterEach(() => {

packages/gen-ai/frontend/src/__tests__/cypress/cypress/tests/mocked/chatbot/newChatFeature.cy.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,7 @@ describe('Chatbot - New Chat Modal (Mocked)', () => {
8686
cy.wait('@aaModels');
8787

8888
// Verify that a model is selected by checking the dropdown shows a model name
89-
// Use .first() since there are two model dropdowns (header and settings panel)
90-
cy.findAllByTestId('model-selector-toggle')
91-
.first()
92-
.should('be.visible')
93-
.and('contain', 'Llama');
89+
cy.findByTestId('chatbot-model-selector-toggle').should('be.visible').and('contain', 'Llama');
9490
});
9591

9692
it(

packages/gen-ai/frontend/src/app/Chatbot/components/ChatbotPaneHeader.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ const ChatbotPaneHeader: React.FC<ChatbotPaneHeaderProps> = ({
5757
<FlexItem style={{ fontWeight: 600, whiteSpace: 'nowrap' }}>{label}</FlexItem>
5858
)}
5959
<FlexItem>
60-
<ModelDetailsDropdown selectedModel={selectedModel} onModelChange={onModelChange} />
60+
<ModelDetailsDropdown
61+
selectedModel={selectedModel}
62+
onModelChange={onModelChange}
63+
testId="chatbot-model-selector-toggle"
64+
/>
6165
</FlexItem>
6266
<FlexItem>
6367
<Button

packages/gen-ai/frontend/src/app/Chatbot/components/ModelDetailsDropdown.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ interface ModelDetailsDropdownProps {
1818
selectedModel: string;
1919
onModelChange: (value: string) => void;
2020
style?: React.CSSProperties;
21+
testId?: string;
2122
}
2223

2324
const ModelDetailsDropdown: React.FunctionComponent<ModelDetailsDropdownProps> = ({
2425
selectedModel,
2526
onModelChange,
2627
style,
28+
testId = 'model-selector-toggle',
2729
}) => {
2830
const { models, aiModels, maasModels } = React.useContext(ChatbotContext);
2931
const { data: bffConfig } = useFetchBFFConfig();
@@ -58,7 +60,7 @@ const ModelDetailsDropdown: React.FunctionComponent<ModelDetailsDropdownProps> =
5860
style={style}
5961
onClick={() => setIsOpen(!isOpen)}
6062
isExpanded={isOpen}
61-
data-testid="model-selector-toggle"
63+
data-testid={testId}
6264
>
6365
{getLlamaModelDisplayName(selectedModel, aiModels) || placeholder}
6466
</MenuToggle>

packages/gen-ai/frontend/src/app/Chatbot/components/settingsPanelTabs/ModelTabContent.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const ModelTabContent: React.FunctionComponent<ModelTabContentProps> = ({
3232
selectedModel={selectedModel}
3333
onModelChange={onModelChange}
3434
style={{ width: '100%' }}
35+
testId="settings-model-selector-toggle"
3536
/>
3637
</FormGroup>
3738
<ModelParameterFormGroup

0 commit comments

Comments
 (0)