Skip to content

Commit 942504a

Browse files
committed
Prepare feedbackCallout test utilities for side nav v2 and reenable search feedback test
1 parent 769477c commit 942504a

File tree

5 files changed

+29
-7
lines changed

5 files changed

+29
-7
lines changed

src/core/packages/chrome/navigation/src/components/feedback_snippet/feedback_button.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export const FeedbackButton = ({ handleOpenSurvey }: FeedbackButtonProps) => {
2828

2929
return (
3030
<EuiButtonEmpty
31+
data-test-subj="sideNavFeedbackButton"
3132
onClick={handleOpenSurvey}
3233
css={css`
3334
margin: ${euiTheme.size.m};

src/core/packages/chrome/navigation/src/components/feedback_snippet/feedback_panel.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ export const FeedbackPanel = ({
9797
const closePanelIcon = (
9898
<EuiFlexItem grow={false}>
9999
<EuiButtonIcon
100+
data-test-subj="sideNavFeedbackPanelDismiss"
100101
iconType="cross"
101102
color="text"
102103
onClick={handleDismissPanel}
@@ -172,6 +173,7 @@ export const FeedbackPanel = ({
172173

173174
return (
174175
<EuiPanel
176+
data-test-subj="sideNavFeedbackPanel"
175177
grow={false}
176178
hasShadow
177179
css={css`

src/platform/test/functional/page_objects/solution_navigation.ts

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ export function SolutionNavigationProvider(ctx: Pick<FtrProviderContext, 'getSer
217217
},
218218
async clickPanelLink(deepLinkId: string) {
219219
if (await isV2()) {
220+
await this.feedbackCallout.dismiss();
220221
await this.clickLink({ deepLinkId: deepLinkId as AppDeepLinkId });
221222
} else {
222223
await testSubjects.click(`~panelNavItem-id-${deepLinkId}`);
@@ -354,14 +355,33 @@ export function SolutionNavigationProvider(ctx: Pick<FtrProviderContext, 'getSer
354355
}
355356
},
356357
feedbackCallout: {
358+
async getFeedbackTestSubjectId() {
359+
return (await isV2()) ? 'sideNavFeedbackPanel' : 'sideNavfeedbackCallout';
360+
},
361+
async getFeedbackDismissTestSubjectId() {
362+
return (await isV2())
363+
? 'sideNavFeedbackPanel > sideNavFeedbackPanelDismiss'
364+
: 'sideNavfeedbackCallout > euiDismissCalloutButton';
365+
},
357366
async expectExists() {
358-
await testSubjects.existOrFail('sideNavfeedbackCallout', { timeout: TIMEOUT_CHECK });
367+
await testSubjects.existOrFail(await this.getFeedbackTestSubjectId(), {
368+
timeout: TIMEOUT_CHECK,
369+
});
359370
},
360371
async expectMissing() {
361-
await testSubjects.missingOrFail('sideNavfeedbackCallout', { timeout: TIMEOUT_CHECK });
372+
return (await isV2())
373+
? await testSubjects.existOrFail('sideNavFeedbackButton', {
374+
timeout: TIMEOUT_CHECK,
375+
})
376+
: await testSubjects.missingOrFail(await this.getFeedbackTestSubjectId(), {
377+
timeout: TIMEOUT_CHECK,
378+
});
362379
},
363380
async dismiss() {
364-
await testSubjects.click('sideNavfeedbackCallout > euiDismissCalloutButton');
381+
const feedbackTestSubjectId = await this.getFeedbackTestSubjectId();
382+
if (await testSubjects.exists(feedbackTestSubjectId, { timeout: TIMEOUT_CHECK })) {
383+
await testSubjects.click(await this.getFeedbackDismissTestSubjectId());
384+
}
365385
},
366386
},
367387
},

x-pack/solutions/search/test/functional_solution_sidenav/tests/search_sidenav.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
8080
});
8181

8282
it('renders a feedback callout', async function () {
83-
await solutionNavigation.sidenav.skipIfV2(this);
84-
83+
await solutionNavigation.sidenav.clickLink({ navId: 'stack_management' });
8584
await solutionNavigation.sidenav.feedbackCallout.expectExists();
8685
await solutionNavigation.sidenav.feedbackCallout.dismiss();
8786
await solutionNavigation.sidenav.feedbackCallout.expectMissing();

x-pack/solutions/search/test/serverless/functional/test_suites/navigation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ export default function ({ getPageObject, getService }: FtrProviderContext) {
129129
// > Management
130130
await solutionNavigation.sidenav.clickLink({ navId: 'management' });
131131
await solutionNavigation.sidenav.expectLinkActive({ navId: 'management' });
132-
await svlCommonNavigation.sidenav.clickPanelLink('management:transform');
133-
await svlCommonNavigation.breadcrumbs.expectBreadcrumbTexts(['Management', 'Transforms']);
132+
await svlCommonNavigation.sidenav.clickPanelLink('management:tags');
133+
await svlCommonNavigation.breadcrumbs.expectBreadcrumbTexts(['Management', 'Tags']);
134134

135135
// navigate back to serverless search overview
136136
await svlCommonNavigation.clickLogo();

0 commit comments

Comments
 (0)