Merge remote-tracking branch 'origin/master' into release/v6.3.0

# Conflicts:
#	tests/live/serviceDesk/assets.test.ts

Author: MrRefactoring

tests/live/serviceDesk/assets.test.ts

@@ -6,13 +6,17 @@ import { getClient } from '../setup/client';
 /**
  * Live suite for the Service Management `assets` API (`getAssetsWorkspaces`, `getInsightWorkspaces`).
  *
- * Two endpoints that once did the same thing under two names — Insight was renamed Assets, and the older path was
- * kept for compatibility. It no longer is: on Cloud today `/assets/workspace` answers and `/insight/workspace` is
- * gone, so what used to be worth asserting about the pair — that they behave identically — is simply false, and the
- * suite pins the deprecation instead.
+ * Two endpoints for one thing under two names — Insight was renamed Assets, and the older path is kept for
+ * compatibility. The suite used to assert that the pair behaves identically, which stopped being true when
+ * `/assets/workspace` began answering on this tenant while `/insight/workspace` did not.
  *
- * Both are gated behind the same agent licence as the rest of the surface, so an instance without one refuses rather
- * than answers, and the suite accepts either.
+ * That divergence is a licensing fact, not a retirement: the older path refuses with the same 403 as
+ * `getServiceDesks`, `getCustomerRequests` and `getOrganizations`, all four carrying a byte-identical copy of Jira's
+ * generic HTML error page. Atlassian has announced no removal, and both operations remain in the specification. So
+ * each path is pinned on its own terms — answer or typed refusal — rather than against the other.
+ *
+ * What the refusal is worth asserting for is the body: an HTML page is the one response on any of the three surfaces
+ * that the JSON parser has no way to read, and it still has to arrive as a typed error with its status intact.
  */
 describe('Jira Service Management — assets (live)', () => {
   let serviceDesk: ServiceDeskClient;
@@ -21,11 +25,18 @@ describe('Jira Service Management — assets (live)', () => {
     serviceDesk = createServiceDeskClient(getClient());
   });
 
-  it('answers the assets workspace lookup, or refuses typed', async () => {
-    const result = await serviceDesk.assets.getAssetsWorkspaces({ limit: 5 }).catch((e: unknown) => e);
+  /** Both names answer with the same page of workspace ids, so both are read the same way. */
+  const lookups: [string, () => Promise<unknown>][] = [
+    ['assets.getAssetsWorkspaces', () => serviceDesk.assets.getAssetsWorkspaces({ limit: 5 })],
+    ['assets.getInsightWorkspaces', () => serviceDesk.assets.getInsightWorkspaces({ limit: 5 })],
+  ];
+
+  it.each(lookups)('answers the %s lookup, or refuses typed', async (_name, lookup) => {
+    const result = await lookup().catch((e: unknown) => e);
 
     if (result instanceof Error) {
-      expect(isForbiddenError(result) || (result as { status?: number }).status === 404).toBe(true);
+      expect(isForbiddenError(result)).toBe(true);
+      expect((result as { status?: number }).status).toBe(403);
 
       return;
     }
@@ -38,25 +49,4 @@ describe('Jira Service Management — assets (live)', () => {
       expect(typeof workspace.workspaceId).toBe('string');
     }
   });
-
-  /**
-   * The retired path answers `403` with an HTML error page rather than the JSON every other refusal on this surface
-   * carries. That is the reason this test is worth keeping now that the paths have diverged: it is the only live
-   * assertion that a non-JSON body still arrives as a typed error with its status intact, instead of failing inside
-   * the response parser.
-   */
-  it('refuses the retired Insight path with a typed error, whatever the body', async () => {
-    const result = await serviceDesk.assets.getInsightWorkspaces({ limit: 1 }).catch((e: unknown) => e);
-
-    if (!(result instanceof Error)) {
-      const page = result as Awaited<ReturnType<typeof serviceDesk.assets.getInsightWorkspaces>>;
-
-      expect(Array.isArray(page.values)).toBe(true);
-
-      return;
-    }
-
-    expect(typeof (result as { status?: number }).status).toBe('number');
-    expect(isForbiddenError(result) || (result as { status?: number }).status === 404).toBe(true);
-  });
 });

tests/live/serviceDesk/request.test.ts

@@ -9,8 +9,10 @@ import { getClient } from '../setup/client';
  * Every endpoint here is gated behind an agent licence the test account does not hold, so this file asserts the
  * shape of the refusal across the whole surface rather than skipping. Two things make that worth doing.
  *
- * First, the refusal is a 403 with an empty body — the least informative answer in any of the three surfaces — so
- * that it arrives *typed* is the only thing standing between a caller and a bare rejection they cannot classify.
+ * First, the refusal is a 403 carrying Jira's generic HTML error page rather than a service-desk error — the same
+ * body `getServiceDesks`, `getOrganizations` and `getInsightWorkspaces` refuse with, and the one answer on any of the
+ * three surfaces that a JSON parser cannot read at all. That it arrives *typed*, with its status intact, is the only
+ * thing standing between a caller and a bare rejection they cannot classify.
  *
  * Second, several of these endpoints would be unsafe even with a licence: `createCustomerRequest` opens a real ticket
  * a support team would see, `createRequestComment` writes into a customer conversation, and