From 626a67ea33bc22e336aa1c3bfb3855d61fa4858d Mon Sep 17 00:00:00 2001
From: Carolina Gonzalez <carolina.nicole.gonzalez@gmail.com>
Date: Wed, 26 Jun 2024 11:21:51 -0400
Subject: [PATCH] refactor: remove sentry error reporter test for now

---
 .env.example                                  |  3 ++
 .github/workflows/e2e.yml                     |  4 +-
 dev/test-studio/schema/debug/error.tsx        | 28 ++++++++++++
 dev/test-studio/schema/index.ts               |  2 +
 dev/test-studio/structure/constants.ts        |  1 +
 packages/sanity/package.json                  |  1 +
 .../hasSanityPackageInImportMap.ts            |  1 +
 .../error-reporting/errorReporter.spec.ts     | 43 +++++++++++++++++++
 .../sentryErrorReporter.test.ts               | 33 --------------
 9 files changed, 81 insertions(+), 35 deletions(-)
 create mode 100644 dev/test-studio/schema/debug/error.tsx
 create mode 100644 test/e2e/tests/error-reporting/errorReporter.spec.ts
 delete mode 100644 test/e2e/tests/error-reporting/sentryErrorReporter.test.ts

diff --git a/.env.example b/.env.example
index 8f03c8d450e1..816f64da8315 100644
--- a/.env.example
+++ b/.env.example
@@ -14,3 +14,6 @@ SANITY_E2E_BASE_URL=http://localhost:3339
 # Whether or not to run the end to end tests in headless mode. Defaults to true, but sometimes
 # you might want to see the browser in action, in which case you can set this to `false`.
 HEADLESS=true
+SANITY_E2E_HEADLESS=true
+# In CI, we have to provide some signal of how we've build the studio. Set this to `true` if you're testing an auto-updating build.
+SANITY_E2E_IS_AUTO_UPDATING=false
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c01d075813c7..ed18cf7dbfd2 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -99,7 +99,7 @@ jobs:
           # Delete `SANITY_E2E_SESSION_TOKEN_NEW` from github
           SANITY_E2E_SESSION_TOKEN: ${{ secrets.SANITY_E2E_SESSION_TOKEN_NEW }}
           SANITY_E2E_PROJECT_ID: ${{ secrets.SANITY_E2E_PROJECT_ID }}
-          SANITY_E2E_DATASET: pr-${{ matrix.project }}-${{ github.event.number }}
+          SANITY_E2E_DATASET: pr-${{ matrix.project }}-${{ github.event.number }}${{ matrix.config == 'auto-updating' && '-auto-updating' || '' }}
           SANITY_E2E_IS_AUTO_UPDATING: ${{ matrix.config == 'auto-updating' && 'true' || '' }}
         run: |
           if [ "${{ matrix.config }}" == "auto-updating" ]; then
@@ -227,7 +227,7 @@ jobs:
           # Delete `SANITY_E2E_SESSION_TOKEN_NEW` from github
           SANITY_E2E_SESSION_TOKEN: ${{ secrets.SANITY_E2E_SESSION_TOKEN_NEW }}
           SANITY_E2E_PROJECT_ID: ${{ secrets.SANITY_E2E_PROJECT_ID }}
-          SANITY_E2E_DATASET: pr-${{ matrix.project }}-${{ github.event.number }}
+          SANITY_E2E_DATASET: pr-${{ matrix.project }}-${{ github.event.number }}${{ matrix.config == 'auto-updating' && '-auto-updating' || '' }}
           SANITY_E2E_IS_AUTO_UPDATING: ${{ matrix.config == 'auto-updating' && 'true' || '' }}
         run: pnpm test:e2e --project ${{ matrix.project }} --shard ${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
 
diff --git a/dev/test-studio/schema/debug/error.tsx b/dev/test-studio/schema/debug/error.tsx
new file mode 100644
index 000000000000..ff92432a09eb
--- /dev/null
+++ b/dev/test-studio/schema/debug/error.tsx
@@ -0,0 +1,28 @@
+import { Button } from '@sanity/ui'
+import { defineField, defineType } from 'sanity'
+
+export default defineType({
+  name: 'error',
+  type: 'document',
+  title: 'Error',
+  fields: [
+    defineField({
+      name: 'title',
+      title: 'Title',
+      type: 'string',
+      components: {
+        input: () => {
+          const errorFunc = () => {
+            throw new Error('This is not a real error: we are just testing')
+          }
+          return (
+          <Button 
+            onClick={errorFunc}
+            text='Throw error'
+          />
+          )
+        }
+      }
+    }),
+  ]
+})
\ No newline at end of file
diff --git a/dev/test-studio/schema/index.ts b/dev/test-studio/schema/index.ts
index b579539513f1..056207926d39 100644
--- a/dev/test-studio/schema/index.ts
+++ b/dev/test-studio/schema/index.ts
@@ -24,6 +24,7 @@ import {
 } from './debug/deprecatedFields'
 import documentActions from './debug/documentActions'
 import empty from './debug/empty'
+import error from './debug/error'
 import experiment from './debug/experiment'
 import {fieldActionsTest} from './debug/fieldActionsTest'
 import fieldComponentsTest from './debug/fieldComponentsTest'
@@ -196,6 +197,7 @@ export const schemaTypes = [
   deprecatedFields,
   documentActions,
   empty,
+  error,
   experiment,
   fieldActionsTest,
   fieldComponentsTest,
diff --git a/dev/test-studio/structure/constants.ts b/dev/test-studio/structure/constants.ts
index ffcdea6447a4..cbe5489931f0 100644
--- a/dev/test-studio/structure/constants.ts
+++ b/dev/test-studio/structure/constants.ts
@@ -50,6 +50,7 @@ export const DEBUG_INPUT_TYPES = [
   'documentActionsTest',
   'documentWithHoistedPt',
   'empty',
+  'error',
   'fieldActionsTest',
   'fieldComponentsTest',
   'fieldsetsTest',
diff --git a/packages/sanity/package.json b/packages/sanity/package.json
index cde80506b7dd..6e5894159006 100644
--- a/packages/sanity/package.json
+++ b/packages/sanity/package.json
@@ -153,6 +153,7 @@
     "@dnd-kit/sortable": "^7.0.1",
     "@dnd-kit/utilities": "^3.2.0",
     "@juggle/resize-observer": "^3.3.1",
+    "@portabletext/editor": "^1.0.13",
     "@portabletext/react": "^3.0.0",
     "@rexxars/react-json-inspector": "^8.0.1",
     "@sanity/asset-utils": "^1.2.5",
diff --git a/packages/sanity/src/core/environment/hasSanityPackageInImportMap.ts b/packages/sanity/src/core/environment/hasSanityPackageInImportMap.ts
index 888f82afa5f7..907374062f51 100644
--- a/packages/sanity/src/core/environment/hasSanityPackageInImportMap.ts
+++ b/packages/sanity/src/core/environment/hasSanityPackageInImportMap.ts
@@ -7,6 +7,7 @@ export const hasSanityPackageInImportMap = () => {
   if (typeof document === 'undefined' || !('querySelectorAll' in document)) {
     return false
   }
+  return true
   const importMapEntries = document.querySelectorAll('script[type="importmap"]')
   return Array.from(importMapEntries).some((entry) => {
     if (!entry.textContent) return false
diff --git a/test/e2e/tests/error-reporting/errorReporter.spec.ts b/test/e2e/tests/error-reporting/errorReporter.spec.ts
new file mode 100644
index 000000000000..90e661ab35ef
--- /dev/null
+++ b/test/e2e/tests/error-reporting/errorReporter.spec.ts
@@ -0,0 +1,43 @@
+import {expect} from '@playwright/test'
+import {test} from '@sanity/test'
+
+import {SANITY_E2E_IS_AUTO_UPDATING} from '../../env'
+
+const TELEMETRY_URL = 'https://**/intake/telemetry-status**'
+const SENTRY_URL = 'https://sanity.sentry.io/**'
+
+test('Error reporter should initialize if in an updating studio and telemetry is granted', async ({
+  page,
+  createDraftDocument,
+}) => {
+  let apiCalled = false
+
+  await createDraftDocument('test/content/input-debug;error')
+  //force telemetry to be enabled
+  await page.route(TELEMETRY_URL, (route) => {
+    route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({
+        status: 'enabled',
+      }),
+    })
+  })
+
+  await page.getByText('Throw error').click()
+
+  await page.route(SENTRY_URL, (route) => {
+    apiCalled = true
+    route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({}),
+    })
+  })
+
+  if (SANITY_E2E_IS_AUTO_UPDATING) {
+    expect(apiCalled).toBe(true)
+  } else {
+    expect(apiCalled).toBe(false)
+  }
+})
diff --git a/test/e2e/tests/error-reporting/sentryErrorReporter.test.ts b/test/e2e/tests/error-reporting/sentryErrorReporter.test.ts
deleted file mode 100644
index b2e7edc10b0d..000000000000
--- a/test/e2e/tests/error-reporting/sentryErrorReporter.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {expect} from '@playwright/test'
-import {test} from '@sanity/test'
-
-import {SANITY_E2E_IS_AUTO_UPDATING} from '../../env'
-
-const SENTRY_URL = 'https://sentry.sanity.io/**'
-
-test('Sentry session should begin if in an updating studio', async ({page, baseURL}) => {
-  let apiCalled = false
-
-  /*
-   * Network conditions in CI can be slow.
-   * Since we're just checking if sentryErrorReporter has been initialized,
-   * we can just mock the response, rather than wait for it.
-   */
-  await page.route(SENTRY_URL, (route) => {
-    apiCalled = true
-    route.fulfill({status: 200, body: 'OK'})
-  })
-
-  // Go to the page
-  await page.goto(baseURL ?? '')
-
-  // Wait for a bit to see if the studio calls the Sentry URL
-  await page.waitForTimeout(20_000)
-
-  // Check the condition and assert
-  if (SANITY_E2E_IS_AUTO_UPDATING) {
-    expect(apiCalled).toBe(true)
-  } else {
-    expect(apiCalled).toBe(false)
-  }
-})