Merge pull request #1228 from snyk/fix/show-gradle-suggestion-on-test

fix: show gradle suggestion on test too
snyk · Jun 22, 2020 · 6d286fd · 6d286fd
2 parents d450573 + 5bcd9de
commit 6d286fd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/src/cli/commands/monitor/formatters/format-monitor-response.ts b/src/cli/commands/monitor/formatters/format-monitor-response.ts
@@ -30,7 +30,7 @@ export function formatMonitorOutput(
     '\n\n' +
     (advertiseGradleSubProjectsCount && foundProjectCount
       ? chalk.bold.white(
-          `This project has multiple sub-projects (${foundProjectCount}), ` +
+          `Tip: This project has multiple sub-projects (${foundProjectCount}), ` +
             'use --all-sub-projects flag to scan all sub-projects.\n\n',
         )
       : '') +

diff --git a/src/cli/commands/test/index.ts b/src/cli/commands/test/index.ts
@@ -205,9 +205,14 @@ async function test(...args: MethodArgs): Promise<TestCommandResult> {
   );
 
   let response = results
-    .map((unused, i) => {
+    .map((result, i) => {
       resultOptions[i].pinningSupported = pinningSupported;
-      return displayResult(results[i] as LegacyVulnApiResult, resultOptions[i]);
+
+      return displayResult(
+        results[i] as LegacyVulnApiResult,
+        resultOptions[i],
+        result.foundProjectCount,
+      );
     })
     .join(`\n${SEPARATOR}`);
 
@@ -389,7 +394,7 @@ function displayResult(
     projectType === 'gradle' && !options['gradle-sub-project'];
   if (advertiseGradleSubProjectsCount && foundProjectCount) {
     multiProjAdvice = chalk.bold.white(
-      `\n\nThis project has multiple sub-projects (${foundProjectCount}), ` +
+      `\n\nTip: This project has multiple sub-projects (${foundProjectCount}), ` +
         'use --all-sub-projects flag to scan all sub-projects.',
     );
   }

diff --git a/test/acceptance/cli-test/cli-test.gradle.spec.ts b/test/acceptance/cli-test/cli-test.gradle.spec.ts
@@ -148,7 +148,12 @@ export const GradleTests: AcceptanceTests = {
       const plugin = {
         async inspect(): Promise<pluginApi.MultiProjectResult> {
           return {
-            plugin: { name: 'gradle' },
+            plugin: {
+              meta: {
+                allSubProjectNames: ['a', 'b'],
+              },
+              name: 'gradle',
+            },
             scannedProjects: [
               {
                 depTree: {
@@ -191,6 +196,12 @@ export const GradleTests: AcceptanceTests = {
         /Tested 2 projects/,
         'number projects tested displayed properly',
       );
+      t.match(res, '(2)', '2 sub projects found');
+      t.match(
+        res,
+        /use --all-sub-projects flag to scan all sub-projects/,
+        'all-sub-projects flag is suggested',
+      );
       for (let i = 0; i < tests.length; i++) {
         const meta = tests[i]
           .slice(tests[i].indexOf('Organization:'))