adjust tests

Author: Lms24

packages/bundler-plugin-core/test/option-mappings.test.ts

@@ -34,6 +34,7 @@ describe("normalizeUserOptions()", () => {
       silent: false,
       telemetry: true,
       injectReleasesMap: false,
+      url: "https://sentry.io",
     });
   });
 
@@ -76,6 +77,7 @@ describe("normalizeUserOptions()", () => {
       silent: false,
       telemetry: true,
       injectReleasesMap: false,
+      url: "https://sentry.io",
     });
   });
 
@@ -104,6 +106,35 @@ describe("normalizeUserOptions()", () => {
     process.env["SENTRY_HEADER"] = _original_SENTRY_HEADER;
     process.env["CUSTOM_HEADER"] = _original_CUSTOM_HEADER;
   });
+
+  test.each(["https://sentry.io", undefined])(
+    "should enable telemetry if `telemetry` is true and Sentry SaaS URL (%s) is used",
+    (url) => {
+      const options = {
+        include: "",
+        url,
+      };
+
+      expect(normalizeUserOptions(options).telemetry).toBe(true);
+    }
+  );
+
+  test.each([
+    [true, "https://selfhostedSentry.io"],
+    [false, "https://sentry.io"],
+    [false, "https://selfhostedSentry.io"],
+  ])(
+    "should disable telemetry if `telemetry` is %s and Sentry SaaS URL (%s) is used",
+    (telemetry, url) => {
+      const options = {
+        include: "",
+        telemetry,
+        url,
+      };
+
+      expect(normalizeUserOptions(options).telemetry).toBe(false);
+    }
+  );
 });
 
 describe("validateOptions", () => {

packages/bundler-plugin-core/test/sentry/telemetry.test.ts

@@ -1,50 +1,12 @@
-import { Hub, NodeClient } from "@sentry/node";
+import { Hub } from "@sentry/node";
 import { InternalOptions } from "../../src/options-mapping";
 import { SentryCLILike } from "../../src/sentry/cli";
 import {
   addPluginOptionTags,
   captureMinimalError,
-  makeSentryClient,
   turnOffTelemetryForSelfHostedSentry,
 } from "../../src/sentry/telemetry";
 
-describe("makeSentryClient", () => {
-  const dsn = "https://abc@sentry.io:1234/subpath/123";
-
-  it("should create a client that sends stuff if `telemetry` is enabled and Sentry SaaS is used", () => {
-    const { client } = makeSentryClient(dsn, true, "https://sentry.io");
-    expect(client).toBeInstanceOf(NodeClient);
-    expect(client.getOptions()).toMatchObject({
-      dsn,
-      enabled: true,
-      tracesSampleRate: 1.0,
-      sampleRate: 1.0,
-      release: __PACKAGE_VERSION__,
-      tracePropagationTargets: ["sentry.io/api"],
-    });
-  });
-
-  it.each([
-    [true, "https://selfhostedSentry.io"],
-    [false, "https://sentry.io"],
-    [false, "https://selfhostedSentry.io"],
-  ])(
-    "should create a client that doesnt sends stuff if `telemetry` is `%s` and URL is '%s'",
-    (enabled, url) => {
-      const { client } = makeSentryClient(dsn, enabled, url);
-      expect(client).toBeInstanceOf(NodeClient);
-      expect(client.getOptions()).toMatchObject({
-        dsn,
-        enabled: false,
-        tracesSampleRate: 0,
-        sampleRate: 0,
-        release: __PACKAGE_VERSION__,
-        tracePropagationTargets: ["sentry.io/api"],
-      });
-    }
-  );
-});
-
 describe("turnOffTelemetryForSelfHostedSentry", () => {
   const mockedCLI = {
     execute: jest