Address PR review comments
- Remove cli-node/src/paths.ts compat layer, migrate all cli-node
internal usage to import targetPaths from @backstage/cli-common
- Use single-arg overrideTargetPaths('/root') where dir === rootDir
- Scope mockDir to each describe block in bump.test.ts to avoid
shared state issues with overrideTargetPaths
- Remove unnecessary overrideTargetPaths from plugin-manager.test.ts
- Remove stale findPaths mock from createApp.test.ts
- Use overrideTargetPaths in getWorkspaceRoot.test.ts and cli-node tests
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -14,8 +14,6 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { targetPaths } from '@backstage/cli-common';
|
||||
|
||||
const setPlatform = (platform: string) => {
|
||||
Object.defineProperty(process, `platform`, {
|
||||
configurable: true,
|
||||
@@ -37,7 +35,6 @@ describe('getWorkspaceRoot', () => {
|
||||
`('platform: $platform', ({ platform, native, portable }) => {
|
||||
let realPlatform: string;
|
||||
let getWorkspaceRoot: () => string;
|
||||
let mockResolveRoot: jest.MockedFunction<typeof targetPaths.resolveRoot>;
|
||||
|
||||
beforeEach(() => {
|
||||
realPlatform = process.platform;
|
||||
@@ -45,21 +42,10 @@ describe('getWorkspaceRoot', () => {
|
||||
|
||||
jest.resetModules();
|
||||
|
||||
mockResolveRoot = jest.fn();
|
||||
|
||||
jest.doMock('@backstage/cli-common', () => ({
|
||||
...jest.requireActual('@backstage/cli-common'),
|
||||
targetPaths: {
|
||||
get dir() {
|
||||
return mockResolveRoot();
|
||||
},
|
||||
get rootDir() {
|
||||
return mockResolveRoot();
|
||||
},
|
||||
resolveRoot: mockResolveRoot,
|
||||
},
|
||||
}));
|
||||
|
||||
const {
|
||||
overrideTargetPaths,
|
||||
} = require('@backstage/cli-common/testUtils');
|
||||
overrideTargetPaths(native);
|
||||
getWorkspaceRoot = require('./getWorkspaceRoot').getWorkspaceRoot;
|
||||
});
|
||||
|
||||
@@ -68,8 +54,6 @@ describe('getWorkspaceRoot', () => {
|
||||
});
|
||||
|
||||
it('returns an appropriately-formatted workspace root path', () => {
|
||||
mockResolveRoot.mockReturnValue(native);
|
||||
|
||||
expect(getWorkspaceRoot()).toEqual(portable);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user