Merge pull request #65 from HubSpot/br-unit-tests-11

Tests for object utils (and other small fixes)

lib/environment.ts

@@ -5,9 +5,10 @@ export function getValidEnv(
   env?: Environment | null,
   maskedProductionValue?: Environment
 ): Environment {
-  const prodValue = maskedProductionValue
-    ? maskedProductionValue
-    : ENVIRONMENTS.PROD;
+  const prodValue =
+    typeof maskedProductionValue === 'string'
+      ? maskedProductionValue
+      : ENVIRONMENTS.PROD;
 
   const returnVal =
     typeof env &&

lib/validate.ts

@@ -1,8 +1,8 @@
 import fs from 'fs-extra';
 import { HUBL_EXTENSIONS } from '../constants/extensions';
 import { validateHubl } from '../api/validateHubl';
-import { walk } from '../lib/fs';
-import { getExt } from '../lib/path';
+import { walk } from './fs';
+import { getExt } from './path';
 import { LintResult } from '../types/HublValidation';
 
 export async function lint(

models/OAuth2Manager.ts

@@ -40,7 +40,10 @@ class OAuth2Manager {
     this.writeTokenInfo = writeTokenInfo;
     this.refreshTokenRequest = null;
     this.account = account;
-    // NOTE: Potential issues by not using maskProductionValue = '' for env like in cli-lib
+
+    if (this.account.env) {
+      this.account.env = getValidEnv(this.account.env, '');
+    }
   }
 
   async accessToken(): Promise<string | undefined> {

utils/__tests__/objectUtils.ts

@@ -0,0 +1,38 @@
+import { mergeDeep, isObject } from '../objectUtils';
+
+describe('utils/objectUtils', () => {
+  describe('isObject()', () => {
+    it('should return false for non objects', () => {
+      expect(isObject('foo')).toBeFalsy();
+      expect(isObject(null)).toBeFalsy();
+      expect(isObject(1)).toBeFalsy();
+    });
+
+    it('should return true for objects', () => {
+      expect(isObject({})).toBeTruthy();
+      expect(isObject({ some: 'object' })).toBeTruthy();
+    });
+  });
+
+  describe('mergeDeep()', () => {
+    it('should merge simple objects', () => {
+      const object1 = { a: 'a' };
+      const object2 = { b: 'b' };
+      const object3 = { c: 'c' };
+
+      const result = mergeDeep(object1, object2, object3);
+
+      expect(result).toMatchObject({ a: 'a', b: 'b', c: 'c' });
+    });
+
+    it('should deeply merge nested objects', () => {
+      const object1 = { a: { a: 'a' } };
+      const object2 = { a: { b: 'b' } };
+      const object3 = { a: { c: 'c' } };
+
+      const result = mergeDeep(object1, object2, object3);
+
+      expect(result).toMatchObject({ a: { a: 'a', b: 'b', c: 'c' } });
+    });
+  });
+});

utils/objectUtils.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isObject(item: any) {
+export function isObject(item: any) {
   return item && typeof item === 'object' && !Array.isArray(item);
 }