Merge branch 'master' into dependabot/npm_and_yarn/src/dispatch/stati…

…c/dispatch/eslint-plugin-vuetify-2.1.0
Netflix · Nov 11, 2023 · 7a29551 · 7a29551
2 parents 178cde9 + 6aa1620
commit 7a29551
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Setup sample database
         run: dispatch database restore --dump-file data/dispatch-sample-data.dump && dispatch database upgrade
       - name: Run tests
-        run: npx playwright test --project=chromium --project=firefox
+        run: npx playwright test --project=chromium
       - uses: actions/upload-artifact@v3
         if: always()
         with:

diff --git a/src/dispatch/static/dispatch/src/entity_type/EntityTypeCreateDialog.vue b/src/dispatch/static/dispatch/src/entity_type/EntityTypeCreateDialog.vue
@@ -19,7 +19,7 @@
               <v-card-text>
                 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.
-                <v-radio-group label="Type" v-model="type" row>
+                <v-radio-group label="Type" v-model="type" inline>
                   <v-radio label="Regular Expression" value="regex" />
                   <v-radio label="JSON Path" value="json" />
                 </v-radio-group>

diff --git 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"
           />
-          <v-radio-group v-model="scope" label="Scope" row>
+          <v-radio-group v-model="scope" label="Scope" inline>
             <v-tooltip max-width="250px" location="left">
               <template #activator="{ props }">
                 <v-radio v-bind="props" label="Multiple" value="multiple" />
@@ -84,7 +84,7 @@
         <v-card-text>
           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.
-          <v-radio-group label="Type" v-model="type" row>
+          <v-radio-group label="Type" v-model="type" inline>
             <v-radio label="Regular Expression" value="regex" />
             <v-radio label="JSON Path" value="json" />
           </v-radio-group>

diff --git a/src/dispatch/static/dispatch/src/signal/filter/SignalFilterCreateDialog.vue b/src/dispatch/static/dispatch/src/signal/filter/SignalFilterCreateDialog.vue
@@ -36,7 +36,7 @@
                     <v-radio-group
                       label="Action"
                       v-model="action"
-                      row
+                      inline
                       class="justify-right"
                       name="Action"
                       :rules="[rules.required]"

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/auth-page.ts b/tests/static/e2e/pages/auth-page.ts
@@ -27,7 +27,7 @@ export class AuthPage {
     this.registerButton = page.getByRole("button", { name: "Register" })
     // Shared Components
     this.emailLabel = page.getByLabel("Email")
-    this.passwordLabel = page.getByLabel("Password")
+    this.passwordLabel = page.getByLabel("Password", { exact: true })
   }
 
   async gotoLogin() {

diff --git a/tests/static/e2e/pages/incident-edit-sheet.ts b/tests/static/e2e/pages/incident-edit-sheet.ts
@@ -19,7 +19,7 @@ export class IncidentsPage {
     this.CloseButton = page.getByRole("button", { name: "Close" })
 
     this.CostsTab = page.getByRole("tab", { name: "Costs" })
-    this.CostsAmount = page.getByLabel("Amount")
+    this.CostsAmount = page.getByLabel("Amount", { exact: true })
   }
 
   async goto(incident: string) {

diff --git a/tests/static/e2e/pages/incidents-page.ts b/tests/static/e2e/pages/incidents-page.ts
@@ -27,10 +27,10 @@ export class IncidentsPage {
       .getByRole("button")
       .nth(2)
     this.EditMenu = page.getByTestId("incident-table-edit")
-    this.EditViewEdit = page.getByRole("menuitem", { name: "View / Edit" })
-    this.EditCreateReport = page.getByRole("menuitem", { name: "Create Report" })
-    this.EditRunWorkflow = page.getByRole("menuitem", { name: "Run Workflow" })
-    this.EditDelete = page.getByRole("menuitem", { name: "Delete" })
+    this.EditViewEdit = page.getByText("View / Edit", { exact: true })
+    this.EditCreateReport = page.getByText("Create Report", { exact: true })
+    this.EditRunWorkflow = page.getByText("Run Workflow", { exact: true })
+    this.EditDelete = page.getByText("Delete", { exact: true })
   }
 
   async goto() {

diff --git a/tests/static/e2e/pages/report-incident-page.ts b/tests/static/e2e/pages/report-incident-page.ts
@@ -19,8 +19,8 @@ export class ReportIncidentPage {
     this.page = page
     this.route = orgSlug + Routes.ReportIncident
     this.reportHeader = page.getByText("Report Incident").first()
-    this.titleTextBox = page.getByLabel("Title")
-    this.descriptionTextBox = page.getByLabel("Description")
+    this.titleTextBox = page.getByLabel("Title", { exact: true })
+    this.descriptionTextBox = page.getByLabel("Description", { exact: true })
     this.projectDropdown = page.getByRole("combobox").filter({ hasText: "Project" }).locator("i")
     this.typeDropdown = page.getByRole("button", { name: "Type" })
     this.priorityDropdown = page.getByRole("button", { name: "Priority" })
@@ -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