From 579dfd2d0bbeb5bcac2eef9d953194840495f378 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Thu, 28 Apr 2022 10:31:49 +0300
Subject: [PATCH] Deprecate another var with injectable

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 src/common/vars.ts                           |  4 ++++
 src/common/vars/is-development.injectable.ts |  5 ++---
 src/common/vars/is-test-env.injectable.ts    | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 src/common/vars/is-test-env.injectable.ts

diff --git a/src/common/vars.ts b/src/common/vars.ts
index 1901a7726a..b7916678d1 100644
--- a/src/common/vars.ts
+++ b/src/common/vars.ts
@@ -26,6 +26,10 @@ export const isLinux = process.platform === "linux";
 
 export const isDebugging = ["true", "1", "yes", "y", "on"].includes((process.env.DEBUG ?? "").toLowerCase());
 export const isSnap = !!process.env.SNAP;
+
+/**
+ * @deprecated Switch to using isTestEnvInjectable
+ */
 export const isTestEnv = !!process.env.JEST_WORKER_ID;
 
 /**
diff --git a/src/common/vars/is-development.injectable.ts b/src/common/vars/is-development.injectable.ts
index 6eb399b6be..190d754d8d 100644
--- a/src/common/vars/is-development.injectable.ts
+++ b/src/common/vars/is-development.injectable.ts
@@ -3,19 +3,18 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { isTestEnv } from "../vars";
 import isProductionInjectable from "./is-production.injectable";
+import isTestEnvInjectable from "./is-test-env.injectable";
 
 const isDevelopmentInjectable = getInjectable({
   id: "is-development",
 
   instantiate: (di) => {
     const isProduction = di.inject(isProductionInjectable);
+    const isTestEnv = di.inject(isTestEnvInjectable);
 
     return !isTestEnv && !isProduction;
   },
-
-  causesSideEffects: true,
 });
 
 export default isDevelopmentInjectable;
diff --git a/src/common/vars/is-test-env.injectable.ts b/src/common/vars/is-test-env.injectable.ts
new file mode 100644
index 0000000000..85965d0098
--- /dev/null
+++ b/src/common/vars/is-test-env.injectable.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import environmentVariablesInjectable from "../utils/environment-variables.injectable";
+
+const isTestEnvInjectable = getInjectable({
+  id: "is-test-env",
+
+  instantiate: (di) => {
+    const { JEST_WORKER_ID: jestWorkerId } = di.inject(environmentVariablesInjectable);
+
+    return !!jestWorkerId;
+  },
+});
+
+export default isTestEnvInjectable;