From f25513f2ca3b4b77ad484a03705c749ef7d4d0f2 Mon Sep 17 00:00:00 2001
From: Vincent Germain <vgermain@scaleway.com>
Date: Wed, 22 Feb 2023 19:58:20 +0100
Subject: [PATCH 1/2] test: adjust window coverage

---
 .../src/helpers/__tests__/is-browser.browser.ts  |  9 +++++++++
 .../src/helpers/__tests__/is-browser.node.ts     |  9 +++++++++
 .../clients/src/helpers/__tests__/is-browser.ts  | 16 ----------------
 .../src/scw/fetch/__tests__/build-fetcher.ts     | 11 -----------
 packages/clients/src/scw/fetch/build-fetcher.ts  |  4 +++-
 5 files changed, 21 insertions(+), 28 deletions(-)
 create mode 100644 packages/clients/src/helpers/__tests__/is-browser.browser.ts
 create mode 100644 packages/clients/src/helpers/__tests__/is-browser.node.ts
 delete mode 100644 packages/clients/src/helpers/__tests__/is-browser.ts

diff --git a/packages/clients/src/helpers/__tests__/is-browser.browser.ts b/packages/clients/src/helpers/__tests__/is-browser.browser.ts
new file mode 100644
index 000000000..37ac617b1
--- /dev/null
+++ b/packages/clients/src/helpers/__tests__/is-browser.browser.ts
@@ -0,0 +1,9 @@
+/** @jest-environment jsdom */
+import { describe, expect, it } from '@jest/globals'
+import { isBrowser } from '../is-browser'
+
+describe('isBrowser', () => {
+  it('returns true by default', () => {
+    expect(isBrowser()).toBe(true)
+  })
+})
diff --git a/packages/clients/src/helpers/__tests__/is-browser.node.ts b/packages/clients/src/helpers/__tests__/is-browser.node.ts
new file mode 100644
index 000000000..0a7ad8072
--- /dev/null
+++ b/packages/clients/src/helpers/__tests__/is-browser.node.ts
@@ -0,0 +1,9 @@
+/** @jest-environment node */
+import { describe, expect, it } from '@jest/globals'
+import { isBrowser } from '../is-browser'
+
+describe('isBrowser', () => {
+  it('returns false by default', () => {
+    expect(isBrowser()).toBe(false)
+  })
+})
diff --git a/packages/clients/src/helpers/__tests__/is-browser.ts b/packages/clients/src/helpers/__tests__/is-browser.ts
deleted file mode 100644
index 734197d3a..000000000
--- a/packages/clients/src/helpers/__tests__/is-browser.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { describe, expect, it } from '@jest/globals'
-import { isBrowser } from '../is-browser'
-
-describe('isBrowser', () => {
-  it('returns false by default', () => {
-    expect(isBrowser()).toBe(!!global.window)
-  })
-
-  it('returns true after defining a window', () => {
-    // @ts-expect-error Fake window/document for the test
-    global.window = { document: 'not-undefined' }
-    expect(isBrowser()).toBe(true)
-    // @ts-expect-error Reset the global variable
-    delete global.window
-  })
-})
diff --git a/packages/clients/src/scw/fetch/__tests__/build-fetcher.ts b/packages/clients/src/scw/fetch/__tests__/build-fetcher.ts
index d72ad8bf3..f7fc53ee9 100644
--- a/packages/clients/src/scw/fetch/__tests__/build-fetcher.ts
+++ b/packages/clients/src/scw/fetch/__tests__/build-fetcher.ts
@@ -43,17 +43,6 @@ describe(`buildRequest`, () => {
     })
   }
 
-  it(`has NOT the header "User-Agent" when browser is detected`, () => {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-expect-error Fake window/document for the test
-    global.window = { document: 'not-undefined' }
-    const fReq = buildRequest(SCW_POST_REQUEST, DEFAULT_SETTINGS)
-    expect(fReq.headers.get('User-Agent')).toBeNull()
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-expect-error Reset the global variable
-    delete global.window
-  })
-
   it(`has the custom headers`, () => {
     const mReq: ScwRequest = {
       ...SCW_POST_REQUEST,
diff --git a/packages/clients/src/scw/fetch/build-fetcher.ts b/packages/clients/src/scw/fetch/build-fetcher.ts
index 871b10252..6fe1d0d65 100644
--- a/packages/clients/src/scw/fetch/build-fetcher.ts
+++ b/packages/clients/src/scw/fetch/build-fetcher.ts
@@ -32,7 +32,9 @@ export const buildRequest = (
     body: request.body,
     headers: {
       Accept: 'application/json',
-      ...(!isBrowser() ? { 'User-Agent': settings.userAgent } : {}),
+      .../* istanbul ignore next */ (!isBrowser()
+        ? { 'User-Agent': settings.userAgent }
+        : {}),
       ...request.headers,
     },
     method: request.method,

From 828d787abd040b8cc1704dcbc3c71ef026cbfbb6 Mon Sep 17 00:00:00 2001
From: Vincent Germain <vgermain@scaleway.com>
Date: Wed, 22 Feb 2023 20:16:24 +0100
Subject: [PATCH 2/2] fix: avoid double *

---
 packages/clients/src/helpers/__tests__/is-browser.browser.ts | 2 +-
 packages/clients/src/helpers/__tests__/is-browser.node.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/clients/src/helpers/__tests__/is-browser.browser.ts b/packages/clients/src/helpers/__tests__/is-browser.browser.ts
index 37ac617b1..36af77921 100644
--- a/packages/clients/src/helpers/__tests__/is-browser.browser.ts
+++ b/packages/clients/src/helpers/__tests__/is-browser.browser.ts
@@ -1,4 +1,4 @@
-/** @jest-environment jsdom */
+/* @jest-environment jsdom */
 import { describe, expect, it } from '@jest/globals'
 import { isBrowser } from '../is-browser'
 
diff --git a/packages/clients/src/helpers/__tests__/is-browser.node.ts b/packages/clients/src/helpers/__tests__/is-browser.node.ts
index 0a7ad8072..1602bd363 100644
--- a/packages/clients/src/helpers/__tests__/is-browser.node.ts
+++ b/packages/clients/src/helpers/__tests__/is-browser.node.ts
@@ -1,4 +1,4 @@
-/** @jest-environment node */
+/* @jest-environment node */
 import { describe, expect, it } from '@jest/globals'
 import { isBrowser } from '../is-browser'