diff --git a/app/assets/javascripts/vue_shared/security_reports/store/utils.js b/app/assets/javascripts/vue_shared/security_reports/store/utils.js index 458bacce91567f567c8e86012fe3e2ad8773a876..408b7be6dd01d7f073c7942117d13ef87e86140f 100644 --- a/app/assets/javascripts/vue_shared/security_reports/store/utils.js +++ b/app/assets/javascripts/vue_shared/security_reports/store/utils.js @@ -90,7 +90,7 @@ const createStatusMessage = ({ reportType, status, total }) => { if (status) { message = __('%{reportType} %{status}'); } else if (!total) { - message = __('%{reportType} detected %{totalStart}no%{totalEnd} vulnerabilities.'); + message = __('%{reportType} detected %{totalStart}no%{totalEnd} new vulnerabilities.'); } else { message = __( '%{reportType} detected %{totalStart}%{total}%{totalEnd} potential %{vulnMessage}', diff --git a/ee/spec/frontend/vue_mr_widget/ee_mr_widget_options_spec.js b/ee/spec/frontend/vue_mr_widget/ee_mr_widget_options_spec.js index a91bd21411529db4e4be419115cfe23e6071dd24..31e4845fe3c08804e4066f58fd150948a357c540 100644 --- a/ee/spec/frontend/vue_mr_widget/ee_mr_widget_options_spec.js +++ b/ee/spec/frontend/vue_mr_widget/ee_mr_widget_options_spec.js @@ -188,7 +188,7 @@ describe('ee merge request widget options', () => { .find(`${SAST_SELECTOR} .report-block-list-issue-description`) .text(), ), - ).toEqual('SAST detected no vulnerabilities.'); + ).toEqual('SAST detected no new vulnerabilities.'); }); }); @@ -299,7 +299,7 @@ describe('ee merge request widget options', () => { .find(`${DEPENDENCY_SCANNING_SELECTOR} .report-block-list-issue-description`) .text(), ), - ).toEqual('Dependency scanning detected no vulnerabilities.'); + ).toEqual('Dependency scanning detected no new vulnerabilities.'); }); }); @@ -319,7 +319,7 @@ describe('ee merge request widget options', () => { .find(`${DEPENDENCY_SCANNING_SELECTOR} .report-block-list-issue-description`) .text(), ), - ).toEqual('Dependency scanning detected no vulnerabilities.'); + ).toEqual('Dependency scanning detected no new vulnerabilities.'); }); }); diff --git a/ee/spec/frontend/vue_shared/security_reports/grouped_security_reports_app_spec.js b/ee/spec/frontend/vue_shared/security_reports/grouped_security_reports_app_spec.js index bdbd663906fd5d713e33b1011cb854efac57dba7..e0b0e3c9ee1f3a84d056502678130c73a61baa2a 100644 --- a/ee/spec/frontend/vue_shared/security_reports/grouped_security_reports_app_spec.js +++ b/ee/spec/frontend/vue_shared/security_reports/grouped_security_reports_app_spec.js @@ -251,28 +251,28 @@ describe('Grouped security reports app', () => { // Renders the summary text expect(findReportSummary().text()).toEqual( - 'Security scanning detected no vulnerabilities.', + 'Security scanning detected no new vulnerabilities.', ); const wrapperText = wrapper.text(); // Renders Sast result - expect(wrapperText).toContain('SAST detected no vulnerabilities.'); + expect(wrapperText).toContain('SAST detected no new vulnerabilities.'); // Renders DSS result - expect(wrapper.text()).toContain('Dependency scanning detected no vulnerabilities.'); + expect(wrapper.text()).toContain('Dependency scanning detected no new vulnerabilities.'); // Renders container scanning result - expect(wrapperText).toContain('Container scanning detected no vulnerabilities.'); + expect(wrapperText).toContain('Container scanning detected no new vulnerabilities.'); // Renders DAST result - expect(wrapperText).toContain('DAST detected no vulnerabilities.'); + expect(wrapperText).toContain('DAST detected no new vulnerabilities.'); // Renders Coverage Fuzzing result - expect(wrapperText).toContain('Coverage fuzzing detected no vulnerabilities.'); + expect(wrapperText).toContain('Coverage fuzzing detected no new vulnerabilities.'); // Renders API Fuzzing result - expect(wrapperText).toContain('API fuzzing detected no vulnerabilities.'); + expect(wrapperText).toContain('API fuzzing detected no new vulnerabilities.'); }); }); diff --git a/ee/spec/frontend/vue_shared/security_reports/store/modules/api_fuzzing/getters_spec.js b/ee/spec/frontend/vue_shared/security_reports/store/modules/api_fuzzing/getters_spec.js index eb8ea57f9ad6b7f01614327849bb1405ba8fff37..cfb973c7c293479b7d33525034a43e78afc4acb8 100644 --- a/ee/spec/frontend/vue_shared/security_reports/store/modules/api_fuzzing/getters_spec.js +++ b/ee/spec/frontend/vue_shared/security_reports/store/modules/api_fuzzing/getters_spec.js @@ -30,7 +30,7 @@ describe('groupedApiFuzzingText', () => { countMessage: '', critical: 0, high: 0, - message: 'API fuzzing detected %{totalStart}no%{totalEnd} vulnerabilities.', + message: 'API fuzzing detected %{totalStart}no%{totalEnd} new vulnerabilities.', other: 0, status: '', total: 0, diff --git a/ee/spec/frontend/vue_shared/security_reports/store/modules/sast/getters_spec.js b/ee/spec/frontend/vue_shared/security_reports/store/modules/sast/getters_spec.js index e1c9aaf95aca146b9d850e05500d535406265bc4..44acc20798dad8a2d4d2ecd7716c9aa1028f3e70 100644 --- a/ee/spec/frontend/vue_shared/security_reports/store/modules/sast/getters_spec.js +++ b/ee/spec/frontend/vue_shared/security_reports/store/modules/sast/getters_spec.js @@ -30,7 +30,7 @@ describe('groupedSastText', () => { countMessage: '', critical: 0, high: 0, - message: 'SAST detected %{totalStart}no%{totalEnd} vulnerabilities.', + message: 'SAST detected %{totalStart}no%{totalEnd} new vulnerabilities.', other: 0, status: '', total: 0, diff --git a/ee/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/getters_spec.js b/ee/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/getters_spec.js index 6747bddc0e4a149487b8b05b04fb0097f5a7808c..364187c25f92ed459ca4144271c96e44320942e4 100644 --- a/ee/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/getters_spec.js +++ b/ee/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/getters_spec.js @@ -30,7 +30,7 @@ describe('groupedSecretDetectionText', () => { countMessage: '', critical: 0, high: 0, - message: 'Secret detection detected %{totalStart}no%{totalEnd} vulnerabilities.', + message: 'Secret detection detected %{totalStart}no%{totalEnd} new vulnerabilities.', other: 0, status: '', total: 0, diff --git a/ee/spec/frontend/vue_shared/security_reports/store/utils_spec.js b/ee/spec/frontend/vue_shared/security_reports/store/utils_spec.js index 094e6615d2689a0508f548e28bdc83dea7625b2f..f07f871111ff379d42aee0e705863c746e995ee8 100644 --- a/ee/spec/frontend/vue_shared/security_reports/store/utils_spec.js +++ b/ee/spec/frontend/vue_shared/security_reports/store/utils_spec.js @@ -117,7 +117,7 @@ describe('security reports utils', () => { it.each` vulnerabilities | message | countMessage - ${undefined} | ${' detected %{totalStart}no%{totalEnd} vulnerabilities.'} | ${''} + ${undefined} | ${' detected %{totalStart}no%{totalEnd} new vulnerabilities.'} | ${''} ${{ critical }} | ${` detected %{totalStart}2%{totalEnd} potential vulnerabilities`} | ${`%{criticalStart}2 Critical%{criticalEnd} %{highStart}0 High%{highEnd} and %{otherStart}0 Others%{otherEnd}`} ${{ high }} | ${` detected %{totalStart}4%{totalEnd} potential vulnerabilities`} | ${`%{criticalStart}0 Critical%{criticalEnd} %{highStart}4 High%{highEnd} and %{otherStart}0 Others%{otherEnd}`} ${{ other }} | ${` detected %{totalStart}7%{totalEnd} potential vulnerabilities`} | ${`%{criticalStart}0 Critical%{criticalEnd} %{highStart}0 High%{highEnd} and %{otherStart}7 Others%{otherEnd}`} @@ -146,7 +146,7 @@ describe('security reports utils', () => { it('should pass through the report type', () => { const reportType = 'HAL'; expect(groupedTextBuilder({ reportType }).message).toEqual( - 'HAL detected %{totalStart}no%{totalEnd} vulnerabilities.', + 'HAL detected %{totalStart}no%{totalEnd} new vulnerabilities.', ); }); @@ -233,7 +233,7 @@ describe('security reports utils', () => { countMessage: '', critical: 0, high: 0, - message: 'dummyReport detected %{totalStart}no%{totalEnd} vulnerabilities.', + message: 'dummyReport detected %{totalStart}no%{totalEnd} new vulnerabilities.', other: 0, status: '', total: 0, diff --git a/locale/gitlab.pot b/locale/gitlab.pot index d90273ef8db6ba9ad4fa7f2a01592fffd1c8b01b..50de84a560e2d0c7d8f22fde92e4bd5753d0610a 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -911,7 +911,7 @@ msgstr "" msgid "%{reportType} detected %{totalStart}%{total}%{totalEnd} potential %{vulnMessage}" msgstr "" -msgid "%{reportType} detected %{totalStart}no%{totalEnd} vulnerabilities." +msgid "%{reportType} detected %{totalStart}no%{totalEnd} new vulnerabilities." msgstr "" msgid "%{retryButtonStart}Try again%{retryButtonEnd} or %{newFileButtonStart}attach a new file%{newFileButtonEnd}."