Revert "test(ui): Return router props from initializeOrg (#49372)"

This reverts commit 1933148aa60a3ccbdd45f21cbacb2a4d7b354ea6.

Co-authored-by: scttcper <1400464+scttcper@users.noreply.github.com>

static/app/components/createAlertButton.spec.jsx

@@ -171,9 +171,9 @@ describe('CreateAlertFromViewButton', () => {
     expect(navigateTo).toHaveBeenCalledWith(
       `/organizations/org-slug/alerts/wizard/?`,
       expect.objectContaining({
-        params: expect.objectContaining({
+        params: {
           orgId: 'org-slug',
-        }),
+        },
       })
     );
   });

static/app/components/datePageFilter.spec.tsx

@@ -6,6 +6,9 @@ import OrganizationStore from 'sentry/stores/organizationStore';
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
 
 const {organization, router, routerContext} = initializeOrg({
+  organization: {},
+  project: undefined,
+  projects: undefined,
   router: {
     location: {
       query: {},

static/app/components/events/eventReplay/replayPreview.spec.tsx

@@ -60,6 +60,9 @@ jest.mock('sentry/utils/replays/hooks/useReplayData', () => {
 
 const render: typeof baseRender = children => {
   const {router, routerContext} = initializeOrg({
+    organization: {},
+    project: TestStubs.Project(),
+    projects: [TestStubs.Project()],
     router: {
       routes: [
         {path: '/'},

static/app/components/organizations/datePageFilter.spec.tsx

@@ -7,6 +7,9 @@ import OrganizationStore from 'sentry/stores/organizationStore';
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
 
 const {organization, router, routerContext} = initializeOrg({
+  organization: {},
+  project: undefined,
+  projects: undefined,
   router: {
     location: {
       query: {},
@@ -129,6 +132,9 @@ describe('DatePageFilter', function () {
       router: desyncRouter,
       routerContext: desyncRouterContext,
     } = initializeOrg({
+      organization: {},
+      project: undefined,
+      projects: undefined,
       router: {
         location: {
           // the datetime parameters need to be non-null for desync detection to work

static/app/views/alerts/rules/metric/details/index.spec.tsx

@@ -36,7 +36,7 @@ describe('MetricAlertDetails', () => {
   });
 
   it('renders', async () => {
-    const {routerContext, organization, routerProps} = initializeOrg();
+    const {routerContext, organization, router} = initializeOrg();
     const incident = TestStubs.Incident();
     const rule = TestStubs.MetricRule({
       projects: [project.slug],
@@ -55,7 +55,11 @@ describe('MetricAlertDetails', () => {
     render(
       <MetricAlertDetails
         organization={organization}
-        {...routerProps}
+        route={{}}
+        router={router}
+        routes={router.routes}
+        routeParams={router.params}
+        location={router.location}
         params={{ruleId: rule.id}}
       />,
       {context: routerContext, organization}
@@ -77,7 +81,7 @@ describe('MetricAlertDetails', () => {
   });
 
   it('renders selected incident', async () => {
-    const {routerContext, organization, router, routerProps} = initializeOrg();
+    const {routerContext, organization, router} = initializeOrg();
     const rule = TestStubs.MetricRule({projects: [project.slug]});
     const incident = TestStubs.Incident();
 
@@ -102,7 +106,10 @@ describe('MetricAlertDetails', () => {
     render(
       <MetricAlertDetails
         organization={organization}
-        {...routerProps}
+        route={{}}
+        router={router}
+        routes={router.routes}
+        routeParams={router.params}
         location={{...router.location, query: {alert: incident.id}}}
         params={{ruleId: rule.id}}
       />,

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

@@ -61,7 +61,7 @@ describe('Incident Rules Duplicate', function () {
     });
     rule.resolveThreshold = 50;
 
-    const {organization, project, routerProps} = initializeOrg({
+    const {organization, project, router} = initializeOrg({
       organization: {
         access: ['alerts:write'],
       },
@@ -69,7 +69,7 @@ describe('Incident Rules Duplicate', function () {
         params: {},
         location: {
           query: {
-            createFromDuplicate: 'true',
+            createFromDuplicate: true,
             duplicateRuleId: `${rule.id}`,
           },
         },
@@ -87,10 +87,15 @@ describe('Incident Rules Duplicate', function () {
       <Fragment>
         <GlobalModal />
         <MetricRulesDuplicate
+          params={{}}
+          route={{}}
+          routeParams={router.params}
+          router={router}
+          routes={router.routes}
+          location={router.location}
           organization={organization}
           project={project}
           userTeamIds={[]}
-          {...routerProps}
         />
       </Fragment>
     );
@@ -121,7 +126,7 @@ describe('Incident Rules Duplicate', function () {
       desc: 'Send a Slack notification to #feed-ecosystem',
     });
 
-    const {organization, project, routerProps} = initializeOrg({
+    const {organization, project, router} = initializeOrg({
       organization: {
         access: ['alerts:write'],
       },
@@ -129,7 +134,7 @@ describe('Incident Rules Duplicate', function () {
         params: {},
         location: {
           query: {
-            createFromDuplicate: 'true',
+            createFromDuplicate: true,
             duplicateRuleId: `${rule.id}`,
           },
         },
@@ -145,10 +150,15 @@ describe('Incident Rules Duplicate', function () {
 
     render(
       <MetricRulesDuplicate
+        params={{}}
+        route={{}}
+        routeParams={router.params}
+        router={router}
+        routes={router.routes}
+        location={router.location}
         organization={organization}
         project={project}
         userTeamIds={[]}
-        {...routerProps}
       />
     );
 

static/app/views/alerts/wizard/index.spec.tsx

@@ -5,7 +5,7 @@ import AlertWizard from 'sentry/views/alerts/wizard/index';
 
 describe('AlertWizard', () => {
   it('sets crash free dataset to metrics', async () => {
-    const {organization, project, routerProps, routerContext} = initializeOrg({
+    const {organization, project, router, routerContext} = initializeOrg({
       organization: {
         features: [
           'alert-crash-free-metrics',
@@ -15,12 +15,20 @@ describe('AlertWizard', () => {
         ],
         access: ['org:write', 'alerts:write'],
       },
+      project: undefined,
+      projects: undefined,
+      router: undefined,
     });
     render(
       <AlertWizard
         organization={organization}
+        route={{}}
+        router={router}
+        routes={router.routes}
+        routeParams={router.params}
+        location={router.location}
+        params={{projectId: project.slug}}
         projectId={project.slug}
-        {...routerProps}
       />,
       {context: routerContext, organization}
     );

static/app/views/discover/results.spec.tsx

@@ -478,7 +478,7 @@ describe('Results', function () {
             query: {
               ...generateFields(),
               statsPeriod: '60d',
-              project: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].map(String),
+              project: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
             },
           },
         },
@@ -547,11 +547,7 @@ describe('Results', function () {
         organization,
         router: {
           location: {
-            query: {
-              ...generateFields(),
-              statsPeriod: '90d',
-              project: [1, 2, 3, 4].map(String),
-            },
+            query: {...generateFields(), statsPeriod: '90d', project: [1, 2, 3, 4]},
           },
         },
       });
@@ -648,7 +644,7 @@ describe('Results', function () {
             query: {
               id: '1',
               statsPeriod: '7d',
-              project: ['2'],
+              project: [2],
               environment: ['production'],
             },
           },
@@ -1047,7 +1043,7 @@ describe('Results', function () {
       const initialData = initializeOrg({
         organization,
         router: {
-          location: {query: {fromMetric: 'true', id: '1'}},
+          location: {query: {fromMetric: true, id: '1'}},
         },
       });
 
@@ -1084,7 +1080,7 @@ describe('Results', function () {
       const initialData = initializeOrg({
         organization,
         router: {
-          location: {query: {showUnparameterizedBanner: 'true', id: '1'}},
+          location: {query: {showUnparameterizedBanner: true, id: '1'}},
         },
       });
 

static/app/views/issueDetails/groupTagValues.spec.jsx

@@ -8,6 +8,9 @@ const tags = TestStubs.Tags();
 
 function init(tagKey) {
   return initializeOrg({
+    organization: {},
+    project: undefined,
+    projects: undefined,
     router: {
       location: {
         query: {},

static/app/views/onboarding/onboarding.spec.tsx

@@ -22,7 +22,7 @@ describe('Onboarding', function () {
       step: 'welcome',
     };
 
-    const {routerProps, routerContext, organization} = initializeOrg({
+    const {router, route, routerContext, organization} = initializeOrg({
       router: {
         params: routeParams,
       },
@@ -30,7 +30,14 @@ describe('Onboarding', function () {
 
     render(
       <OnboardingContextProvider>
-        <Onboarding {...routerProps} />
+        <Onboarding
+          router={router}
+          location={router.location}
+          params={routeParams}
+          routes={router.routes}
+          routeParams={router.params}
+          route={route}
+        />
       </OnboardingContextProvider>,
       {
         context: routerContext,
@@ -47,7 +54,7 @@ describe('Onboarding', function () {
       step: 'select-platform',
     };
 
-    const {routerProps, routerContext, organization} = initializeOrg({
+    const {router, route, routerContext, organization} = initializeOrg({
       router: {
         params: routeParams,
       },
@@ -55,7 +62,14 @@ describe('Onboarding', function () {
 
     render(
       <OnboardingContextProvider>
-        <Onboarding {...routerProps} />
+        <Onboarding
+          router={router}
+          location={router.location}
+          params={routeParams}
+          routes={router.routes}
+          routeParams={router.params}
+          route={route}
+        />
       </OnboardingContextProvider>,
       {
         context: routerContext,
@@ -79,7 +93,7 @@ describe('Onboarding', function () {
       step: 'setup-docs',
     };
 
-    const {routerProps, routerContext, organization} = initializeOrg({
+    const {router, route, routerContext, organization} = initializeOrg({
       router: {
         params: routeParams,
       },
@@ -132,7 +146,14 @@ describe('Onboarding', function () {
           },
         }}
       >
-        <Onboarding {...routerProps} />
+        <Onboarding
+          router={router}
+          location={router.location}
+          params={routeParams}
+          routes={router.routes}
+          routeParams={router.params}
+          route={route}
+        />
       </OnboardingContextProvider>,
       {
         context: routerContext,
@@ -158,7 +179,7 @@ describe('Onboarding', function () {
       step: 'setup-docs',
     };
 
-    const {routerProps, routerContext, organization} = initializeOrg({
+    const {router, route, routerContext, organization} = initializeOrg({
       organization: {
         features: ['onboarding-project-deletion-on-back-click'],
       },
@@ -214,7 +235,14 @@ describe('Onboarding', function () {
           },
         }}
       >
-        <Onboarding {...routerProps} />
+        <Onboarding
+          router={router}
+          location={router.location}
+          params={routeParams}
+          routes={router.routes}
+          routeParams={router.params}
+          route={route}
+        />
       </OnboardingContextProvider>,
       {
         context: routerContext,
@@ -250,7 +278,7 @@ describe('Onboarding', function () {
       step: 'setup-docs',
     };
 
-    const {routerProps, routerContext, organization} = initializeOrg({
+    const {router, route, routerContext, organization} = initializeOrg({
       organization: {
         features: ['onboarding-project-deletion-on-back-click'],
       },
@@ -306,7 +334,14 @@ describe('Onboarding', function () {
           },
         }}
       >
-        <Onboarding {...routerProps} />
+        <Onboarding
+          router={router}
+          location={router.location}
+          params={routeParams}
+          routes={router.routes}
+          routeParams={router.params}
+          route={route}
+        />
       </OnboardingContextProvider>,
       {
         context: routerContext,
@@ -333,7 +368,7 @@ describe('Onboarding', function () {
       step: 'select-platform',
     };
 
-    const {routerProps, routerContext, organization} = initializeOrg({
+    const {router, route, routerContext, organization} = initializeOrg({
       organization: {
         features: ['onboarding-sdk-selection'],
       },
@@ -344,7 +379,14 @@ describe('Onboarding', function () {
 
     render(
       <OnboardingContextProvider>
-        <Onboarding {...routerProps} />
+        <Onboarding
+          router={router}
+          location={router.location}
+          params={routeParams}
+          routes={router.routes}
+          routeParams={router.params}
+          route={route}
+        />
       </OnboardingContextProvider>,
       {
         context: routerContext,
@@ -372,7 +414,7 @@ describe('Onboarding', function () {
       step: 'select-platform',
     };
 
-    const {routerProps, routerContext, organization} = initializeOrg({
+    const {router, route, routerContext, organization} = initializeOrg({
       organization: {
         features: ['onboarding-sdk-selection'],
       },
@@ -383,7 +425,14 @@ describe('Onboarding', function () {
 
     render(
       <OnboardingContextProvider>
-        <Onboarding {...routerProps} />
+        <Onboarding
+          router={router}
+          location={router.location}
+          params={routeParams}
+          routes={router.routes}
+          routeParams={router.params}
+          route={route}
+        />
       </OnboardingContextProvider>,
       {
         context: routerContext,