refactor: fix tests

graasp · Jul 4, 2024 · ba9c0ad · ba9c0ad
1 parent e99ef5d
commit ba9c0ad
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 28 deletions.
diff --git a/cypress/e2e/item/home/home.cy.ts b/cypress/e2e/item/home/home.cy.ts
@@ -48,9 +48,7 @@ const interceptAccessibleItemsSearch = (searchTerm: string) =>
     .as('getAccessibleSearch');
 
 describe('Home', () => {
-  it.only('visit Home on map by default', () => {
-    cy.stubGeolocationPermission();
-
+  it('visit Home on map by default', () => {
     cy.setUpApi({
       items: generateOwnItems(30),
     });

diff --git a/cypress/e2e/item/view/viewFolder.cy.ts b/cypress/e2e/item/view/viewFolder.cy.ts
@@ -24,8 +24,6 @@ const items = [parentItem, item1, child1, child2];
 
 describe('View Folder', () => {
   it('View folder on map by default', () => {
-    cy.stubGeolocationPermission();
-
     cy.setUpApi({
       items,
     });

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -418,14 +418,3 @@ Cypress.Commands.add('attachFiles', (selector, filenames, options = {}) => {
   );
   selector.selectFile(correctFilenames, options);
 });
-
-Cypress.Commands.add('stubGeolocationPermission', () => {
-  cy.stub(window.navigator, 'permissions').callsFake(() => 'denied');
-
-  // force Barcelona geolocation
-  const latitude = 41.38879;
-  const longitude = 2.15899;
-  cy.stub(window.navigator.geolocation, 'getCurrentPosition').callsFake((cb) =>
-    cb({ coords: { latitude, longitude } }),
-  );
-});
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
@@ -85,8 +85,6 @@ declare global {
         item: { name?: string },
         options?: { confirm?: boolean },
       ): void;
-
-      stubGeolocationPermission(): void;
     }
   }
 }
diff --git a/src/components/item/MapView.tsx b/src/components/item/MapView.tsx
@@ -125,14 +125,14 @@ const MapView = ({
           )}
         </Stack>
         <Stack flex={1}>
-          {(parentId && isLoadingParent) ||
-          (enableGeolocation && !hasFetchedCurrentLocation) ? (
-            <Skeleton width="100%" height="100%" />
-          ) : (
-            <div
-              id={buildMapViewId(parentId)}
-              style={{ width: '100%', height: '100%' }}
-            >
+          <div
+            id={buildMapViewId(parentId)}
+            style={{ width: '100%', height: '100%' }}
+          >
+            {(parentId && isLoadingParent) ||
+            (enableGeolocation && !hasFetchedCurrentLocation) ? (
+              <Skeleton width="100%" height="100%" />
+            ) : (
               <Map
                 currentPosition={currentPosition}
                 useDeleteItemGeolocation={mutations.useDeleteItemGeolocation}
@@ -149,8 +149,8 @@ const MapView = ({
                 // todo: always use builder modal when it is responsive
                 handleAddOnClick={isMobile ? undefined : handleAddOnClick}
               />
-            </div>
-          )}
+            )}
+          </div>
         </Stack>
       </Stack>
       {!isMobile && (