diff --git a/tests/UI/Slack_spec.js b/tests/UI/Slack_spec.js index e2896f6..b4391b7 100644 --- a/tests/UI/Slack_spec.js +++ b/tests/UI/Slack_spec.js @@ -25,6 +25,20 @@ expect(await page.screenshotSelector(selector)).to.matchImage(screenshotName); } + async function openReportTypeSelect() { + await page.evaluate(() => { + const reportTypeField = $('#addEditReport select[name="report_type"]').closest('.matomo-form-field'); + reportTypeField.find('input.select-dropdown')[0].click(); + }); + } + + async function selectSlackReportType() { + await page.evaluate(() => { + const reportTypeField = $('#addEditReport select[name="report_type"]').closest('.matomo-form-field'); + reportTypeField.find('ul li:last').click(); + }); + } + it('should load the schedule report as empty', async function () { const selector = '.page'; await captureScreen('empty_report', async () => { @@ -43,14 +57,14 @@ it('should show send report via Slack as an option', async function () { const selector = '.page'; await captureScreen('send_via_slack_new', async () => { - await page.evaluate(() => $('#addEditReport .matomo-form-field:eq(6) input')[0].click()); + await openReportTypeSelect(); }, selector); }); it('should show slack channel ID input as disabled as Oauth token not configured', async function () { const selector = '.page'; await captureScreen('slack_report_disabled', async () => { - await page.evaluate(() => $('#addEditReport .matomo-form-field:eq(6) ul li:last').click()); + await selectSlackReportType(); }, selector); }); @@ -70,8 +84,8 @@ await captureScreen('slack_report_enabled', async () => { await page.evaluate(() => $('#add-report').click()); await page.waitForNetworkIdle(); - await page.evaluate(() => $('#addEditReport .matomo-form-field:eq(6) input')[0].click()); - await page.evaluate(() => $('#addEditReport .matomo-form-field:eq(6) ul li:last').click()); + await openReportTypeSelect(); + await selectSlackReportType(); await page.evaluate(() => $('#addEditReport .matomo-form-field.slack:eq(0) input')[0].click()); await page.evaluate(() => $('#addEditReport .matomo-form-field.slack:eq(0) li:eq(1)').click()); }, selector); @@ -82,7 +96,7 @@ testEnvironment.configOverride.Slack = {slackOauthToken: 'token'}; testEnvironment.save(); await captureScreen('slack_report_error', async () => { - await page.type('textarea#report_description', 'Slack Report'); + await page.type('input#report_description', 'Slack Report'); await page.evaluate(() => $('#slackVisitsSummary_get').click()); await page.click('.matomo-save-button input.btn'); await page.waitForNetworkIdle(); @@ -104,9 +118,9 @@ await captureScreen('slack_report_pdf_view', async () => { await page.evaluate(() => $('#add-report').click()); await page.waitForNetworkIdle(); - await page.type('textarea#report_description', 'Slack Report PDF'); - await page.evaluate(() => $('#addEditReport .matomo-form-field:eq(6) input')[0].click()); - await page.evaluate(() => $('#addEditReport .matomo-form-field:eq(6) ul li:last').click()); + await page.type('input#report_description', 'Slack Report PDF'); + await openReportTypeSelect(); + await selectSlackReportType(); }, selector); }); @@ -122,4 +136,4 @@ // TODO: Add tests for display options once core changes are merged -}); \ No newline at end of file +}); diff --git a/tests/UI/expected-ui-screenshots/Slack_empty_report.png b/tests/UI/expected-ui-screenshots/Slack_empty_report.png index d2128d8..62e2a23 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_empty_report.png and b/tests/UI/expected-ui-screenshots/Slack_empty_report.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_new_scheduled_reports.png b/tests/UI/expected-ui-screenshots/Slack_new_scheduled_reports.png index a5e748d..06c1c20 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_new_scheduled_reports.png and b/tests/UI/expected-ui-screenshots/Slack_new_scheduled_reports.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_send_via_slack.png b/tests/UI/expected-ui-screenshots/Slack_send_via_slack.png index 1a20333..5c089d6 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_send_via_slack.png and b/tests/UI/expected-ui-screenshots/Slack_send_via_slack.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_send_via_slack_new.png b/tests/UI/expected-ui-screenshots/Slack_send_via_slack_new.png index 7fdff89..2ccbf9e 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_send_via_slack_new.png and b/tests/UI/expected-ui-screenshots/Slack_send_via_slack_new.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_slack_report_disabled.png b/tests/UI/expected-ui-screenshots/Slack_slack_report_disabled.png index 1a20333..5c089d6 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_slack_report_disabled.png and b/tests/UI/expected-ui-screenshots/Slack_slack_report_disabled.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_slack_report_enabled.png b/tests/UI/expected-ui-screenshots/Slack_slack_report_enabled.png index c625497..65727c1 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_slack_report_enabled.png and b/tests/UI/expected-ui-screenshots/Slack_slack_report_enabled.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_slack_report_error.png b/tests/UI/expected-ui-screenshots/Slack_slack_report_error.png index d6e7f7d..377bd36 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_slack_report_error.png and b/tests/UI/expected-ui-screenshots/Slack_slack_report_error.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_save.png b/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_save.png index f952c08..2c9ff82 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_save.png and b/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_save.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_view.png b/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_view.png index f30d35b..76b333f 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_view.png and b/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_view.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_slack_report_save_report.png b/tests/UI/expected-ui-screenshots/Slack_slack_report_save_report.png index 2a03ec8..fb96f04 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_slack_report_save_report.png and b/tests/UI/expected-ui-screenshots/Slack_slack_report_save_report.png differ