test optimizations

Author: Lms24

dev-packages/browser-integration-tests/suites/public-api/logger/integration/test.ts

@@ -1,14 +1,15 @@
 import { expect } from '@playwright/test';
 import type { LogEnvelope } from '@sentry/core';
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest, properFullEnvelopeRequestParser } from '../../../../utils/helpers';
+import {
+  getFirstSentryEnvelopeRequest,
+  properFullEnvelopeRequestParser,
+  testingCdnBundle,
+} from '../../../../utils/helpers';
 
 sentryTest('should capture console object calls', async ({ getLocalTestUrl, page }) => {
-  const bundle = process.env.PW_BUNDLE || '';
   // Only run this for npm package exports
-  if (bundle.startsWith('bundle') || bundle.startsWith('loader')) {
-    sentryTest.skip();
-  }
+  sentryTest.skip(testingCdnBundle());
 
   const url = await getLocalTestUrl({ testDir: __dirname });
 

dev-packages/browser-integration-tests/suites/public-api/logger/scopeAttributes/test.ts

@@ -1,14 +1,14 @@
 import { expect } from '@playwright/test';
 import type { LogEnvelope } from '@sentry/core';
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest, properFullEnvelopeRequestParser } from '../../../../utils/helpers';
+import {
+  getFirstSentryEnvelopeRequest,
+  properFullEnvelopeRequestParser,
+  testingCdnBundle,
+} from '../../../../utils/helpers';
 
 sentryTest('captures logs with scope attributes', async ({ getLocalTestUrl, page }) => {
-  const bundle = process.env.PW_BUNDLE || '';
-  // Only run this for npm package exports
-  if (bundle.startsWith('bundle') || bundle.startsWith('loader')) {
-    sentryTest.skip();
-  }
+  sentryTest.skip(testingCdnBundle());
 
   const url = await getLocalTestUrl({ testDir: __dirname });
 

dev-packages/browser-integration-tests/suites/public-api/logger/simple/test.ts

@@ -1,14 +1,15 @@
 import { expect } from '@playwright/test';
 import type { LogEnvelope } from '@sentry/core';
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest, properFullEnvelopeRequestParser } from '../../../../utils/helpers';
+import {
+  getFirstSentryEnvelopeRequest,
+  properFullEnvelopeRequestParser,
+  testingCdnBundle,
+} from '../../../../utils/helpers';
 
 sentryTest('should capture all logging methods', async ({ getLocalTestUrl, page }) => {
-  const bundle = process.env.PW_BUNDLE || '';
   // Only run this for npm package exports
-  if (bundle.startsWith('bundle') || bundle.startsWith('loader')) {
-    sentryTest.skip();
-  }
+  sentryTest.skip(testingCdnBundle());
 
   const url = await getLocalTestUrl({ testDir: __dirname });
 

dev-packages/browser-integration-tests/utils/helpers.ts

@@ -314,6 +314,14 @@ export function shouldSkipTracingTest(): boolean {
   return bundle != null && !bundle.includes('tracing') && !bundle.includes('esm') && !bundle.includes('cjs');
 }
 
+/**
+ * @returns `true` if we are testing a CDN bundle
+ */
+export function testingCdnBundle(): boolean {
+  const bundle = process.env.PW_BUNDLE;
+  return bundle != null && (bundle.startsWith('bundle') || bundle.startsWith('loader'));
+}
+
 /**
  * Today we always run feedback tests, but this can be used to guard this if we ever need to.
  */