Browse Source

test(js): Remove `route` from initializeOrg (#72062)

Evan Purkhiser 9 months ago
parent
commit
fca1700d19

+ 12 - 12
static/app/utils/withDomainRedirect.spec.tsx

@@ -65,7 +65,7 @@ describe('withDomainRedirect', function () {
     const params = {
       orgId: 'albertos-apples',
     };
-    const {router, route} = initializeOrg({
+    const {router} = initializeOrg({
       router: {
         params,
       },
@@ -78,7 +78,7 @@ describe('withDomainRedirect', function () {
         params={params}
         routes={router.routes}
         routeParams={router.params}
-        route={route}
+        route={{}}
       />,
       {router}
     );
@@ -95,7 +95,7 @@ describe('withDomainRedirect', function () {
     const params = {
       orgId: 'albertos-apples',
     };
-    const {router, route} = initializeOrg({
+    const {router} = initializeOrg({
       organization,
       router: {
         params,
@@ -111,7 +111,7 @@ describe('withDomainRedirect', function () {
           params={params}
           routes={router.routes}
           routeParams={router.params}
-          route={route}
+          route={{}}
         />
       </OrganizationContext.Provider>,
       {router}
@@ -130,7 +130,7 @@ describe('withDomainRedirect', function () {
     const params = {
       orgId: organization.slug,
     };
-    const {router, route} = initializeOrg({
+    const {router} = initializeOrg({
       organization,
       router: {
         params,
@@ -146,7 +146,7 @@ describe('withDomainRedirect', function () {
           params={params}
           routes={router.routes}
           routeParams={router.params}
-          route={route}
+          route={{}}
         />
       </OrganizationContext.Provider>,
       {router}
@@ -169,7 +169,7 @@ describe('withDomainRedirect', function () {
       orgId: organization.slug,
       projectId: 'react',
     };
-    const {router, route} = initializeOrg({
+    const {router} = initializeOrg({
       organization,
       router: {
         params,
@@ -186,7 +186,7 @@ describe('withDomainRedirect', function () {
           params={params}
           routes={router.routes}
           routeParams={router.params}
-          route={route}
+          route={{}}
         />
       </OrganizationContext.Provider>,
       {router}
@@ -205,7 +205,7 @@ describe('withDomainRedirect', function () {
 
     const params = {};
 
-    const {router, route} = initializeOrg({
+    const {router} = initializeOrg({
       organization,
       router: {
         params,
@@ -230,7 +230,7 @@ describe('withDomainRedirect', function () {
           params={params}
           routes={router.routes}
           routeParams={router.params}
-          route={route}
+          route={{}}
         />
       </OrganizationContext.Provider>,
       {router}
@@ -255,7 +255,7 @@ describe('withDomainRedirect', function () {
       orgId: organization.slug,
       projectId: 'react',
     };
-    const {router, route} = initializeOrg({
+    const {router} = initializeOrg({
       organization,
       router: {
         params,
@@ -272,7 +272,7 @@ describe('withDomainRedirect', function () {
           params={params}
           routes={router.routes}
           routeParams={router.params}
-          route={route}
+          route={{}}
         />
       </OrganizationContext.Provider>,
       {router}

+ 6 - 6
static/app/utils/withDomainRequired.spec.tsx

@@ -252,7 +252,7 @@ describe('withDomainRequired', function () {
     const params = {
       orgId: 'albertos-apples',
     };
-    const {router, route} = initializeOrg({
+    const {router} = initializeOrg({
       organization,
       router: {
         params,
@@ -266,7 +266,7 @@ describe('withDomainRequired', function () {
         params={params}
         routes={router.routes}
         routeParams={router.params}
-        route={route}
+        route={{}}
       />,
       {router}
     );
@@ -301,7 +301,7 @@ describe('withDomainRequired', function () {
     const params = {
       orgId: 'albertos-apples',
     };
-    const {router, route} = initializeOrg({
+    const {router} = initializeOrg({
       organization,
       router: {
         params,
@@ -315,7 +315,7 @@ describe('withDomainRequired', function () {
         params={params}
         routes={router.routes}
         routeParams={router.params}
-        route={route}
+        route={{}}
       />,
       {router}
     );
@@ -350,7 +350,7 @@ describe('withDomainRequired', function () {
     const params = {
       orgId: 'albertos-apples',
     };
-    const {router, route} = initializeOrg({
+    const {router} = initializeOrg({
       organization,
       router: {
         params,
@@ -364,7 +364,7 @@ describe('withDomainRequired', function () {
         params={params}
         routes={router.routes}
         routeParams={router.params}
-        route={route}
+        route={{}}
       />,
       {router}
     );

+ 17 - 17
static/app/views/onboarding/setupDocs.spec.tsx

@@ -57,7 +57,7 @@ function renderMockRequests({
 
 describe('Onboarding Setup Docs', function () {
   it('does not render Product Selection', async function () {
-    const {router, route, organization, project} = initializeOrg({
+    const {router, organization, project} = initializeOrg({
       projects: [
         {
           ...initializeOrg().project,
@@ -79,7 +79,7 @@ describe('Onboarding Setup Docs', function () {
           onComplete={() => {}}
           stepIndex={2}
           router={router}
-          route={route}
+          route={{}}
           location={router.location}
           genSkipOnboardingLink={() => ''}
           orgId={organization.slug}
@@ -105,7 +105,7 @@ describe('Onboarding Setup Docs', function () {
   });
 
   it('renders SDK version from the sentry release registry', async function () {
-    const {router, route, organization, project} = initializeOrg({
+    const {router, organization, project} = initializeOrg({
       projects: [
         {
           ...initializeOrg().project,
@@ -127,7 +127,7 @@ describe('Onboarding Setup Docs', function () {
           onComplete={() => {}}
           stepIndex={2}
           router={router}
-          route={route}
+          route={{}}
           location={router.location}
           genSkipOnboardingLink={() => ''}
           orgId={organization.slug}
@@ -148,7 +148,7 @@ describe('Onboarding Setup Docs', function () {
 
   describe('renders Product Selection', function () {
     it('all products checked', async function () {
-      const {router, route, organization, project} = initializeOrg({
+      const {router, organization, project} = initializeOrg({
         router: {
           location: {
             query: {
@@ -183,7 +183,7 @@ describe('Onboarding Setup Docs', function () {
             onComplete={() => {}}
             stepIndex={2}
             router={router}
-            route={route}
+            route={{}}
             location={router.location}
             genSkipOnboardingLink={() => ''}
             orgId={organization.slug}
@@ -207,7 +207,7 @@ describe('Onboarding Setup Docs', function () {
     });
 
     it('only performance checked', async function () {
-      const {router, route, organization, project} = initializeOrg({
+      const {router, organization, project} = initializeOrg({
         router: {
           location: {
             query: {product: [ProductSolution.PERFORMANCE_MONITORING]},
@@ -237,7 +237,7 @@ describe('Onboarding Setup Docs', function () {
             onComplete={() => {}}
             stepIndex={2}
             router={router}
-            route={route}
+            route={{}}
             location={router.location}
             genSkipOnboardingLink={() => ''}
             orgId={organization.slug}
@@ -257,7 +257,7 @@ describe('Onboarding Setup Docs', function () {
     });
 
     it('only session replay checked', async function () {
-      const {router, route, organization, project} = initializeOrg({
+      const {router, organization, project} = initializeOrg({
         router: {
           location: {
             query: {product: [ProductSolution.SESSION_REPLAY]},
@@ -287,7 +287,7 @@ describe('Onboarding Setup Docs', function () {
             onComplete={() => {}}
             stepIndex={2}
             router={router}
-            route={route}
+            route={{}}
             location={router.location}
             genSkipOnboardingLink={() => ''}
             orgId={organization.slug}
@@ -307,7 +307,7 @@ describe('Onboarding Setup Docs', function () {
     });
 
     it('only error monitoring checked', async function () {
-      const {router, route, organization, project} = initializeOrg({
+      const {router, organization, project} = initializeOrg({
         router: {
           location: {
             query: {product: []},
@@ -337,7 +337,7 @@ describe('Onboarding Setup Docs', function () {
             onComplete={() => {}}
             stepIndex={2}
             router={router}
-            route={route}
+            route={{}}
             location={router.location}
             genSkipOnboardingLink={() => ''}
             orgId={organization.slug}
@@ -361,7 +361,7 @@ describe('Onboarding Setup Docs', function () {
 
   describe('JS Loader Script', function () {
     it('renders Loader Script setup', async function () {
-      const {router, route, organization, project} = initializeOrg({
+      const {router, organization, project} = initializeOrg({
         router: {
           location: {
             query: {
@@ -402,7 +402,7 @@ describe('Onboarding Setup Docs', function () {
             onComplete={() => {}}
             stepIndex={2}
             router={router}
-            route={route}
+            route={{}}
             location={router.location}
             genSkipOnboardingLink={() => ''}
             orgId={organization.slug}
@@ -448,7 +448,7 @@ describe('Onboarding Setup Docs', function () {
             onComplete={() => {}}
             stepIndex={2}
             router={router}
-            route={route}
+            route={{}}
             location={router.location}
             genSkipOnboardingLink={() => ''}
             orgId={organization.slug}
@@ -479,7 +479,7 @@ describe('Onboarding Setup Docs', function () {
 
   describe('special platforms', () => {
     it('renders platform other', async function () {
-      const {router, route, organization, project} = initializeOrg({
+      const {router, organization, project} = initializeOrg({
         projects: [
           {
             ...initializeOrg().project,
@@ -501,7 +501,7 @@ describe('Onboarding Setup Docs', function () {
             onComplete={() => {}}
             stepIndex={2}
             router={router}
-            route={route}
+            route={{}}
             location={router.location}
             genSkipOnboardingLink={() => ''}
             orgId={organization.slug}

+ 2 - 2
static/app/views/settings/organizationApiKeys/organizationApiKeysList.spec.tsx

@@ -21,7 +21,7 @@ describe('OrganizationApiKeysList', function () {
       {path: 'api-keys/', name: 'API Key'},
     ];
 
-    const {organization, router, route} = initializeOrg({
+    const {organization, router} = initializeOrg({
       router: {routes},
     });
 
@@ -33,7 +33,7 @@ describe('OrganizationApiKeysList', function () {
         keys={[DeprecatedApiKeyFixture()]}
         router={router}
         routeParams={{}}
-        route={route}
+        route={{}}
         busy={false}
         loading={false}
         location={router.location}

+ 4 - 4
static/app/views/settings/organizationIntegrations/pluginDetailedView.spec.tsx

@@ -62,14 +62,14 @@ function renderMockRequests(orgSlug: Organization['slug']) {
 
 describe('PluginDetailedView', function () {
   it('shows the Integration name and install status', async function () {
-    const {route, router, organization} = initializeOrg();
+    const {router, organization} = initializeOrg();
 
     renderMockRequests(organization.slug);
 
     render(
       <PluginDetailedView
         params={{integrationSlug: 'pagerduty'}}
-        route={route}
+        route={{}}
         routes={[]}
         routeParams={{}}
         router={router}
@@ -89,7 +89,7 @@ describe('PluginDetailedView', function () {
   });
 
   it('view configurations', function () {
-    const {route, router, organization} = initializeOrg({
+    const {router, organization} = initializeOrg({
       router: {location: {query: {tab: 'configurations'}}},
     });
 
@@ -98,7 +98,7 @@ describe('PluginDetailedView', function () {
     render(
       <PluginDetailedView
         params={{integrationSlug: 'pagerduty'}}
-        route={route}
+        route={{}}
         routes={[]}
         routeParams={{}}
         router={router}

+ 0 - 2
tests/js/sentry-test/initializeOrg.tsx

@@ -87,7 +87,5 @@ export function initializeOrg<RouterParams = {orgId: string; projectId: string}>
     projects,
     router,
     routerProps,
-    // @deprecated - not sure what purpose this serves
-    route: {},
   };
 }