ref(test): Remove router return from initializeOrg

static/app/actionCreators/navigation.spec.tsx

@@ -1,5 +1,6 @@
 import {isValidElement} from 'react';
 import type {Location} from 'history';
+import {LocationFixture} from 'sentry-fixture/locationFixture';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
 
@@ -20,7 +21,7 @@ describe('navigation ActionCreator', () => {
     ProjectsStore.init();
     const initialData = initializeOrg();
     navigate = jest.fn();
-    location = {...initialData.router.location, query: {}};
+    location = LocationFixture({query: {}});
     ProjectsStore.loadInitialData(initialData.projects);
     configState = ConfigStore.getState();
   });

static/app/components/charts/eventsAreaChart.spec.tsx

@@ -1,3 +1,5 @@
+import {LocationFixture} from 'sentry-fixture/locationFixture';
+
 import {mockZoomRange} from 'sentry-test/charts';
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
@@ -10,7 +12,7 @@ jest.mock('sentry/components/charts/baseChart', () => ({
 }));
 
 describe('EventsChart with legend', () => {
-  const {router, organization} = initializeOrg();
+  const {organization} = initializeOrg();
 
   beforeEach(() => {
     mockZoomRange(1543449600000, 1543708800000);
@@ -47,7 +49,7 @@ describe('EventsChart with legend', () => {
         start={null}
         end={null}
         utc={false}
-        location={router.location}
+        location={LocationFixture()}
         showLegend
       />
     );

static/app/views/alerts/rules/issue/index.spec.tsx

@@ -5,6 +5,7 @@ import {ProjectFixture} from 'sentry-fixture/project';
 import {ProjectAlertRuleFixture} from 'sentry-fixture/projectAlertRule';
 import {ProjectAlertRuleConfigurationFixture} from 'sentry-fixture/projectAlertRuleConfiguration';
 import {RouteComponentPropsFixture} from 'sentry-fixture/routeComponentPropsFixture';
+import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {
@@ -78,8 +79,19 @@ const projectAlertRuleDetailsRoutes: PlainRoute[] = [
   {path: ':ruleId/'},
 ];
 
-const createWrapper = (props = {}) => {
-  const {organization, project, router} = initializeOrg(props);
+const createWrapper = (props: Parameters<typeof initializeOrg>[0] = {}) => {
+  const {organization, project} = initializeOrg(props);
+  const propsRouterParams = props.router?.params as
+    | Record<string, string | undefined>
+    | undefined;
+  const router = RouterFixture({
+    ...props.router,
+    params: {
+      orgId: organization.slug,
+      projectId: project.slug,
+      ...propsRouterParams,
+    },
+  });
   const params = {
     projectId: project.slug,
     organizationId: organization.slug,

static/app/views/alerts/rules/metric/ruleConditionsForm.spec.tsx

@@ -1,3 +1,5 @@
+import {RouterFixture} from 'sentry-fixture/routerFixture';
+
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
@@ -12,11 +14,12 @@ import {
 import type {AlertType} from 'sentry/views/alerts/wizard/options';
 
 describe('RuleConditionsForm', () => {
-  const {organization, projects, router} = initializeOrg({
+  const {organization, projects} = initializeOrg({
     organization: {
       features: ['search-query-builder-alerts', 'visibility-explore-view'],
     },
   });
+  const router = RouterFixture();
   ProjectsStore.loadInitialData(projects);
 
   const mockSearch = jest.fn();

static/app/views/alerts/rules/metric/ruleForm.spec.tsx

@@ -1,6 +1,7 @@
 import {useTheme} from '@emotion/react';
 import {EventsStatsFixture} from 'sentry-fixture/events';
 import {IncidentTriggerFixture} from 'sentry-fixture/incidentTrigger';
+import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {MetricRuleFixture} from 'sentry-fixture/metricRule';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
@@ -67,7 +68,7 @@ describe('Incident Rules Form', () => {
     });
     organization = initialData.organization;
     project = initialData.project;
-    location = initialData.router.location;
+    location = LocationFixture();
     ProjectsStore.loadInitialData([project]);
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/tags/',

static/app/views/alerts/rules/metric/triggers/chart/index.spec.tsx

@@ -1,4 +1,5 @@
 import {EventsStatsFixture} from 'sentry-fixture/events';
+import {LocationFixture} from 'sentry-fixture/locationFixture';
 import {ThemeFixture} from 'sentry-fixture/theme';
 
 import {initializeOrg} from 'sentry-test/initializeOrg';
@@ -42,13 +43,13 @@ describe('Incident Rules Create', () => {
   const api = new MockApiClient();
 
   it('renders a metric', async () => {
-    const {organization, project, router} = initializeOrg();
+    const {organization, project} = initializeOrg();
 
     render(
       <TriggersChart
         api={api}
         anomalies={[]}
-        location={router.location}
+        location={LocationFixture()}
         organization={organization}
         theme={theme}
         projects={[project]}
@@ -101,13 +102,13 @@ describe('Incident Rules Create', () => {
   });
 
   it('does not show & query total count if showTotalCount === false', async () => {
-    const {organization, project, router} = initializeOrg();
+    const {organization, project} = initializeOrg();
 
     render(
       <TriggersChart
         theme={theme}
         api={api}
-        location={router.location}
+        location={LocationFixture()}
         organization={organization}
         projects={[project]}
         query="event.type:error"
@@ -158,13 +159,13 @@ describe('Incident Rules Create', () => {
   });
 
   it('queries the errors dataset if dataset is errors', async () => {
-    const {organization, project, router} = initializeOrg();
+    const {organization, project} = initializeOrg();
 
     render(
       <TriggersChart
         theme={theme}
         api={api}
-        location={router.location}
+        location={LocationFixture()}
         organization={organization}
         projects={[project]}
         query="event.type:error"
@@ -216,13 +217,13 @@ describe('Incident Rules Create', () => {
   });
 
   it('uses normal sampling for span alerts', async () => {
-    const {organization, project, router} = initializeOrg();
+    const {organization, project} = initializeOrg();
 
     render(
       <TriggersChart
         theme={theme}
         api={api}
-        location={router.location}
+        location={LocationFixture()}
         organization={organization}
         projects={[project]}
         query=""
@@ -263,13 +264,13 @@ describe('Incident Rules Create', () => {
   });
 
   it('uses sample weighted extrapolation mode for editing a migrated alert', async () => {
-    const {organization, project, router} = initializeOrg();
+    const {organization, project} = initializeOrg();
 
     render(
       <TriggersChart
         theme={theme}
         api={api}
-        location={router.location}
+        location={LocationFixture()}
         organization={organization}
         projects={[project]}
         query=""

static/app/views/dashboards/dashboard.spec.tsx

@@ -768,7 +768,7 @@ describe('Dashboards > Dashboard', () => {
       mount({
         dashboard: dashboardWithOneWidget,
         org: testData.organization,
-        location: testData.router.location,
+        location: LocationFixture(),
         onEditWidget: mockOnEditWidget,
       });
 

static/app/views/dashboards/detail.spec.tsx

@@ -269,7 +269,7 @@ describe('Dashboards > Detail', () => {
         makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/default-overview/',
           route: DASHBOARD_ROUTE,
-          query: initialData.router.location.query,
+          query: {},
         })
       );
 
@@ -475,7 +475,7 @@ describe('Dashboards > Detail', () => {
         makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/',
           route: DASHBOARD_ROUTE,
-          query: initialData.router.location.query,
+          query: {},
         })
       );
 
@@ -530,7 +530,7 @@ describe('Dashboards > Detail', () => {
         makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/',
           route: DASHBOARD_ROUTE,
-          query: initialData.router.location.query,
+          query: {},
         })
       );
 
@@ -555,7 +555,7 @@ describe('Dashboards > Detail', () => {
         makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/',
           route: DASHBOARD_ROUTE,
-          query: initialData.router.location.query,
+          query: {},
         })
       );
 
@@ -583,7 +583,7 @@ describe('Dashboards > Detail', () => {
           ...makeDashboardRouterConfig({
             pathname: '/organizations/org-slug/dashboard/1/',
             route: DASHBOARD_ROUTE,
-            query: initialData.router.location.query,
+            query: {},
           }),
           organization: initialData.organization,
         }
@@ -634,7 +634,7 @@ describe('Dashboards > Detail', () => {
         makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/',
           route: DASHBOARD_ROUTE,
-          query: initialData.router.location.query,
+          query: {},
         })
       );
 
@@ -688,7 +688,7 @@ describe('Dashboards > Detail', () => {
         ...makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/',
           route: DASHBOARD_ROUTE,
-          query: initialData.router.location.query,
+          query: {},
         }),
         organization: initialData.organization,
       });
@@ -727,7 +727,7 @@ describe('Dashboards > Detail', () => {
         ...makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/',
           route: DASHBOARD_ROUTE,
-          query: initialData.router.location.query,
+          query: {},
         }),
         organization: initialData.organization,
       });
@@ -769,7 +769,7 @@ describe('Dashboards > Detail', () => {
         ...makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/',
           route: DASHBOARD_ROUTE,
-          query: initialData.router.location.query,
+          query: {},
         }),
         organization: initialData.organization,
       });
@@ -853,7 +853,7 @@ describe('Dashboards > Detail', () => {
         ...makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/widget/0/',
           route: DASHBOARD_WIDGET_ROUTE,
-          query: initialData.router.location.query,
+          query: {},
         }),
         organization: initialData.organization,
       });
@@ -874,7 +874,7 @@ describe('Dashboards > Detail', () => {
         ...makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/widget/123/',
           routes: [DASHBOARD_WIDGET_ROUTE, DASHBOARD_ROUTE],
-          query: initialData.router.location.query,
+          query: {},
         }),
         organization: initialData.organization,
       });
@@ -902,20 +902,15 @@ describe('Dashboards > Detail', () => {
         method: 'POST',
         body: [],
       });
-      const locationWithFilters = {
-        ...initialData.router.location,
-        query: {
-          ...initialData.router.location.query,
-          statsPeriod: '7d',
-          project: [2],
-          environment: ['alpha', 'beta'],
-        },
-      };
       render(<CreateDashboard />, {
         ...makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboards/new/',
           route: DASHBOARD_NEW_ROUTE,
-          query: locationWithFilters.query,
+          query: {
+            statsPeriod: '7d',
+            project: ['2'],
+            environment: ['alpha', 'beta'],
+          },
         }),
         organization: initialData.organization,
       });
@@ -946,7 +941,7 @@ describe('Dashboards > Detail', () => {
         ...makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/widget/1/',
           route: DASHBOARD_WIDGET_ROUTE,
-          query: initialData.router.location.query,
+          query: {},
         }),
         organization: initialData.organization,
       });
@@ -974,7 +969,6 @@ describe('Dashboards > Detail', () => {
           pathname: '/organizations/org-slug/dashboard/1/widget/1/',
           route: DASHBOARD_WIDGET_ROUTE,
           query: {
-            ...initialData.router.location.query,
             release: ['unsaved-release-filter@1.2.0'],
           },
         }),
@@ -1001,7 +995,7 @@ describe('Dashboards > Detail', () => {
         ...makeDashboardRouterConfig({
           pathname: '/organizations/org-slug/dashboard/1/widget/0/',
           route: DASHBOARD_WIDGET_ROUTE,
-          query: {...initialData.router.location.query, rd: 'show', rdRelease: '1.0.0'},
+          query: {rd: 'show', rdRelease: '1.0.0'},
         }),
         organization: initialData.organization,
       });