Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ML] Functional tests - stabilize calendar edit tests #78950

Merged
merged 3 commits into from
Oct 1, 2020
Merged

[ML] Functional tests - stabilize calendar edit tests #78950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f089319
[ML] Functional tests - stabilize calendar edit tests
pheyos Sep 30, 2020
1423127
Update jest snapshot
pheyos Sep 30, 2020
3fef1e9
Merge branch 'master' into stabilize_calendar_edit_test
elasticmachine Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...pplication/settings/calendars/edit/calendar_form/__snapshots__/calendar_form.test.js.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions x-pack/plugins/ml/public/application/settings/calendars/edit/calendar_form/calendar_form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { useCreateAndNavigateToMlLink } from '../../../../contexts/kibana/use_cr
function EditHeader({ calendarId, description }) {
return (
<Fragment>
<EuiTitle>
<EuiTitle data-test-subj="mlCalendarTitle">
<h1>
<FormattedMessage
id="xpack.ml.calendarsEdit.calendarForm.calendarTitle"
Expand Down Expand Up @@ -86,7 +86,7 @@ export const CalendarForm = ({
const redirectToCalendarsManagementPage = useCreateAndNavigateToMlLink(ML_PAGES.CALENDARS_MANAGE);

return (
<EuiForm>
<EuiForm data-test-subj={`mlCalendarForm${isEdit === true ? 'Edit' : 'New'}`}>
{isEdit === true ? (
<EditHeader calendarId={calendarId} description={description} />
) : (
Expand Down
11 changes: 8 additions & 3 deletions x-pack/test/functional/apps/ml/settings/calendar_edit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ export default function ({ getService }: FtrProviderContext) {
const jobConfigs = [createJobConfig('test_calendar_ad_1'), createJobConfig('test_calendar_ad_2')];
const newJobGroups = ['farequote'];

// FLAKY: https://github.com/elastic/kibana/issues/78288
describe.skip('calendar edit', function () {
describe('calendar edit', function () {
before(async () => {
await esArchiver.loadIfNeeded('ml/farequote');
await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
Expand Down Expand Up @@ -56,6 +55,7 @@ export default function ({ getService }: FtrProviderContext) {

await ml.testExecution.logTestStep('calendar edit opens existing calendar');
await ml.settingsCalendar.openCalendarEditForm(calendarId);
await ml.settingsCalendar.assertCalendarTitleValue(calendarId);

await ml.testExecution.logTestStep(
'calendar edit deselects previous job selection and assigns new job groups'
Expand Down Expand Up @@ -85,14 +85,19 @@ export default function ({ getService }: FtrProviderContext) {

await ml.testExecution.logTestStep('calendar edit re-opens the updated calendar');
await ml.settingsCalendar.openCalendarEditForm(calendarId);
await ml.settingsCalendar.assertCalendarTitleValue(calendarId);

await ml.testExecution.logTestStep('calendar edit verifies the job selection is empty');
await ml.settingsCalendar.assertJobSelection([]);

await ml.testExecution.logTestStep(
'calendar edit verifies the job group selection was updated'
);
await ml.settingsCalendar.assertJobGroupSelection(newJobGroups);

await ml.testExecution.logTestStep('calendar edit verifies calendar updated correctly');
await ml.testExecution.logTestStep(
'calendar edit verifies calendar events updated correctly'
);
await asyncForEach(testEvents, async ({ description }) => {
await ml.settingsCalendar.assertEventRowMissing(description);
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/ml/settings/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';

export default function ({ loadTestFile }: FtrProviderContext) {
describe('settings', function () {
this.tags(['quynh', 'skipFirefox']);
this.tags(['mlqa', 'skipFirefox']);

loadTestFile(require.resolve('./calendar_creation'));
loadTestFile(require.resolve('./calendar_edit'));
Expand Down
15 changes: 12 additions & 3 deletions x-pack/test/functional/services/ml/settings_calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export function MachineLearningSettingsCalendarProvider(

async openCalendarEditForm(calendarId: string) {
await testSubjects.click(this.rowSelector(calendarId, 'mlEditCalendarLink'));
await testSubjects.existOrFail('mlPageCalendarEdit');
await testSubjects.existOrFail('mlPageCalendarEdit > mlCalendarFormEdit', { timeout: 5000 });
},

async assertApplyToAllJobsSwitchEnabled(expectedValue: boolean) {
Expand Down Expand Up @@ -224,6 +224,15 @@ export function MachineLearningSettingsCalendarProvider(
);
},

async assertCalendarTitleValue(expectedCalendarId: string) {
const actualValue = await testSubjects.getVisibleText('mlCalendarTitle');
const expectedValue = `Calendar ${expectedCalendarId}`;
expect(actualValue).to.eql(
expectedValue,
`Calendar title should be '${expectedValue}' (got '${actualValue}')`
);
},

async setCalendarId(calendarId: string) {
await mlCommonUI.setValueWithChecks('mlCalendarIdInput', calendarId, {
clearWithKeyboard: true,
Expand Down Expand Up @@ -271,13 +280,13 @@ export function MachineLearningSettingsCalendarProvider(
async navigateToCalendarCreationPage() {
await testSubjects.existOrFail('mlCalendarButtonCreate');
await testSubjects.click('mlCalendarButtonCreate');
await testSubjects.existOrFail('mlPageCalendarEdit');
await testSubjects.existOrFail('mlPageCalendarEdit > mlCalendarFormNew', { timeout: 5000 });
},

async openNewCalendarEventForm() {
await testSubjects.existOrFail('mlCalendarNewEventButton');
await testSubjects.click('mlCalendarNewEventButton');
await testSubjects.existOrFail('mlPageCalendarEdit');
await testSubjects.existOrFail('mlCalendarEventForm');
},

async assertCalendarEventDescriptionValue(expectedValue: string) {
Expand Down