feat: solving an issue with the getNoPlatformInfo function

emulsify-ds · Sep 10, 2024 · 40cbce7 · 40cbce7
1 parent fc7b8a3
commit 40cbce7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/util/platform/getNoPlatformInfo.test.ts b/src/util/platform/getNoPlatformInfo.test.ts
@@ -14,14 +14,15 @@ describe('getNoPlatformInfo', () => {
     await expect(getNoPlatformInfo()).resolves.toEqual({
       name: 'none',
       platformMajorVersion: 1,
-      emulsifyParentDirectory: '/home/uname/Projects/cornflake',
-      root: '/home/uname/Projects/cornflake/',
+      emulsifyParentDirectory:
+        '/home/uname/Projects/cornflake/web/themes/custom',
+      root: '/home/uname/Projects/cornflake',
     });
   });
 
   it('returns void if no project.emulsify.json file is found', async () => {
     expect.assertions(1);
     findFileMock.mockReturnValueOnce(undefined);
-    await expect(getNoPlatformInfo()).resolves.toBe(undefined);
+    await expect(getNoPlatformInfo()).resolves.toBeUndefined();
   });
 });
diff --git a/src/util/platform/getNoPlatformInfo.ts b/src/util/platform/getNoPlatformInfo.ts
@@ -1,7 +1,6 @@
-import type { PlatformInstanceInfo } from '@emulsify-cli/internal';
-import { resolve } from 'path';
+import { dirname, join } from 'path';
 import findFileInCurrentPath from '../fs/findFileInCurrentPath.js';
-import { resolveCurrentPath } from '../fs/resolveCurrentPath.js';
+import type { PlatformInstanceInfo } from '@emulsify-cli/internal';
 
 /**
  * Looks for no platform specified within the cwd, and returns information
@@ -12,13 +11,11 @@ export default async function getNoPlatformInfo(): Promise<PlatformInstanceInfo
   if (!existingProject) {
     return undefined;
   }
-  const { directoryPath } = resolveCurrentPath();
-  const root = resolve(directoryPath);
-
+  const root = dirname(existingProject);
   return {
     root,
     name: 'none',
-    emulsifyParentDirectory: root,
+    emulsifyParentDirectory: join(root, 'web', 'themes', 'custom'),
     platformMajorVersion: 1,
   };
 }
diff --git a/src/util/platform/getPlatformInfo.ts b/src/util/platform/getPlatformInfo.ts
@@ -1,7 +1,7 @@
 import type { PlatformInstanceInfo } from '@emulsify-cli/internal';
 
 import getDrupalInfo from './getDrupalInfo.js';
-import getNoPlatformInfo from './getNoPlatformInfo';
+import getNoPlatformInfo from './getNoPlatformInfo.js';
 
 /**
  * Returns information about the platform the user is currently within (cwd), if it