Skip to content

Commit 351c7bd

Browse files
fix: add condition to preserve project-name with gradle monitor (#4906)
1 parent 068b111 commit 351c7bd

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

src/lib/monitor/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export function getProjectName(
4343
return scannedProject.meta.projectName;
4444
}
4545

46-
if (scannedProject.meta?.gradleProjectName) {
46+
if (scannedProject.meta?.gradleProjectName && !meta['project-name']) {
4747
return scannedProject.meta.gradleProjectName;
4848
}
4949

test/jest/unit/cli-monitor-utils.spec.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,24 @@ describe('cli-monitor-utils test', () => {
155155
expect(res).toEqual('meta-gradle-project');
156156
});
157157

158+
it('getProjectName returns project name when project-name is provided via option', () => {
159+
const scannedProject: ScannedProject = {
160+
depGraph: {} as any,
161+
meta: { gradleProjectName: 'my-gradle-project' },
162+
targetFile: '/tmp/build.gradle',
163+
};
164+
165+
const res = utils.getProjectName(scannedProject, {
166+
method: 'cli',
167+
packageManager: 'gradle',
168+
'policy-path': '',
169+
'project-name': 'project-name-from-option',
170+
isDocker: false,
171+
prune: false,
172+
});
173+
expect(res).toEqual('project-name-from-option');
174+
});
175+
158176
it('getTargetFile returns name from scanned project if container', () => {
159177
const scannedProject: ScannedProject = stubScannedProjectContainer();
160178
const res = utils.getTargetFile(scannedProject, getStubPluginMeta());

0 commit comments

Comments
 (0)