Fix (#19)

reimagined · Feb 19, 2021 · 373a4fd · 373a4fd
1 parent 6c4da02
commit 373a4fd
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 13 deletions.
diff --git a/common/src/utils.ts b/common/src/utils.ts
@@ -53,7 +53,7 @@ export const processWorkspaces = async (
   debug(output)
   const info = JSON.parse(output)
   const workspaces = Object.keys(info).map((name) => {
-    const location = path.resolve(info[name].location)
+    const location = path.resolve(cwd, info[name].location)
     debug(`[${name}] enqueue processing at ${location}`)
     return {
       name,

diff --git a/common/test/utils.test.ts b/common/test/utils.test.ts
@@ -1,7 +1,6 @@
 import { mocked } from 'ts-jest/utils'
 import { execSync } from 'child_process'
 import { readFileSync } from 'fs'
-import * as path from 'path'
 import * as process from 'process'
 import {
   bumpDependencies,
@@ -112,18 +111,18 @@ describe('processWorkspaces', () => {
   beforeEach(() => {
     output = JSON.stringify({
       'package-a': {
-        location: '/path/to/a',
+        location: 'path/to/a',
       },
       'package-b': {
-        location: '/path/to/b',
+        location: 'path/to/b',
       },
     })
     mExec.mockReturnValue(Buffer.from(output))
     processor = jest.fn()
     mReadFile.mockImplementation((file) =>
       Buffer.from(
         JSON.stringify({
-          name: path.dirname(file.toString()),
+          name: file,
         })
       )
     )
@@ -148,29 +147,59 @@ describe('processWorkspaces', () => {
     })
   })
 
-  test('processor invoked for each workspace', async () => {
+  test('processor invoked for each workspace in current working directory', async () => {
     await processWorkspaces(processor, jest.fn())
 
     expect(processor).toHaveBeenCalledWith({
       name: 'package-a',
-      location: '/path/to/a',
+      location: `${process.cwd()}/path/to/a`,
       pkg: {
-        name: '/path/to/a',
+        name: `${process.cwd()}/path/to/a/package.json`,
       },
     })
     expect(processor).toHaveBeenCalledWith({
       name: 'package-b',
-      location: '/path/to/b',
+      location: `${process.cwd()}/path/to/b`,
       pkg: {
-        name: '/path/to/b',
+        name: `${process.cwd()}/path/to/b/package.json`,
       },
     })
   })
 
-  test('package.json files read', async () => {
+  test('package.json files read in current working directory', async () => {
     await processWorkspaces(processor, jest.fn())
 
-    expect(mReadFile).toHaveBeenCalledWith(`/path/to/a/package.json`)
-    expect(mReadFile).toHaveBeenCalledWith(`/path/to/b/package.json`)
+    expect(mReadFile).toHaveBeenCalledWith(
+      `${process.cwd()}/path/to/a/package.json`
+    )
+    expect(mReadFile).toHaveBeenCalledWith(
+      `${process.cwd()}/path/to/b/package.json`
+    )
+  })
+
+  test('processor invoked for each workspace in specified directory', async () => {
+    await processWorkspaces(processor, jest.fn(), '/specified')
+
+    expect(processor).toHaveBeenCalledWith({
+      name: 'package-a',
+      location: `/specified/path/to/a`,
+      pkg: {
+        name: `/specified/path/to/a/package.json`,
+      },
+    })
+    expect(processor).toHaveBeenCalledWith({
+      name: 'package-b',
+      location: `/specified/path/to/b`,
+      pkg: {
+        name: `/specified/path/to/b/package.json`,
+      },
+    })
+  })
+
+  test('package.json files read in specified directory', async () => {
+    await processWorkspaces(processor, jest.fn(), '/specified')
+
+    expect(mReadFile).toHaveBeenCalledWith(`/specified/path/to/a/package.json`)
+    expect(mReadFile).toHaveBeenCalledWith(`/specified/path/to/b/package.json`)
   })
 })