From 77ebfc64488b6c130376e5fadb1361946b5840ed Mon Sep 17 00:00:00 2001 From: David Whittaker Date: Fri, 10 Nov 2023 18:53:03 -0800 Subject: [PATCH 1/2] Continue to work on fixing playwright tests --- .../dispatch/src/tag/TagFilterAutoComplete.vue | 1 - tests/static/e2e/pages/report-incident-page.ts | 2 +- tests/static/e2e/report-submission.spec.ts | 14 +++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue b/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue index b19a24134ed6..ac5a39bb1c77 100644 --- a/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue +++ b/src/dispatch/static/dispatch/src/tag/TagFilterAutoComplete.vue @@ -7,7 +7,6 @@ @update:search="getFilteredData()" chips closable-chips - clearable item-title="name" item-value="id" hide-selected diff --git a/tests/static/e2e/pages/report-incident-page.ts b/tests/static/e2e/pages/report-incident-page.ts index e2f1a53ee671..b270b61876dd 100644 --- a/tests/static/e2e/pages/report-incident-page.ts +++ b/tests/static/e2e/pages/report-incident-page.ts @@ -97,7 +97,7 @@ export class ReportIncidentPage { } async resetPageView() { - await this.pageBorder.click() + // await this.pageBorder.click() } async pageObjectModel( diff --git a/tests/static/e2e/report-submission.spec.ts b/tests/static/e2e/report-submission.spec.ts index 00637f96004b..7fa6fe9445c5 100644 --- a/tests/static/e2e/report-submission.spec.ts +++ b/tests/static/e2e/report-submission.spec.ts @@ -18,13 +18,13 @@ test.describe("Authenticated Dispatch App", () => { await reportIncidentPage.reportIncident(title, description, project, type, priority, tags) // Soft validate that we get redirected to the incident submission form - await expect - .soft(page) - .toHaveURL( - encodeURI( - `./default/incidents/report?project=${project}&incident_priority=${priority}&incident_type=${type}&title=${title}&description=${description}` + tags.map((tag) => "&tag=" + tag).join("") - ) - ) + let expectedURL = encodeURI( + `/default/incidents/report?project=${project}&incident_priority=${priority}&incident_type=${type}&title=${title}&description=${description}` + tags.map((tag) => "&tag=" + tag).join("") + ) + // replace + with %20 + let pageURL = page.url().replace(/\+/g, "%20") + + await expect.soft(pageURL).toContain(expectedURL) // Soft validate that we recieve the report form. await expect From 3fd7a8673663ca80f23669baf80e198c02a2dd87 Mon Sep 17 00:00:00 2001 From: David Whittaker Date: Fri, 10 Nov 2023 19:15:00 -0800 Subject: [PATCH 2/2] Replacing deprecated props --- .../dispatch/src/entity_type/EntityTypeCreateDialog.vue | 2 +- src/dispatch/static/dispatch/src/entity_type/NewEditSheet.vue | 4 ++-- .../dispatch/src/signal/filter/SignalFilterCreateDialog.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dispatch/static/dispatch/src/entity_type/EntityTypeCreateDialog.vue b/src/dispatch/static/dispatch/src/entity_type/EntityTypeCreateDialog.vue index b9c0bd9c017c..cdf29bc71d5f 100644 --- a/src/dispatch/static/dispatch/src/entity_type/EntityTypeCreateDialog.vue +++ b/src/dispatch/static/dispatch/src/entity_type/EntityTypeCreateDialog.vue @@ -19,7 +19,7 @@ Entity types are used to extract useful metadata out of signals. Define either a RegEx or JSON Path expression to pull entities out of a signals raw json. - + diff --git a/src/dispatch/static/dispatch/src/entity_type/NewEditSheet.vue b/src/dispatch/static/dispatch/src/entity_type/NewEditSheet.vue index 57a78b3666f6..713e44425b9c 100644 --- a/src/dispatch/static/dispatch/src/entity_type/NewEditSheet.vue +++ b/src/dispatch/static/dispatch/src/entity_type/NewEditSheet.vue @@ -46,7 +46,7 @@ auto-grow name="Description" /> - +