Merge branch 'master' into bugfix/prefix-filters

Netflix · Nov 11, 2023 · e76617b · e76617b
2 parents ab27711 + 4931ea4
commit e76617b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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