From ea3d5eba83752cfe7fe5fd50009e151c7f368196 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Fri, 3 Feb 2023 10:09:42 +0100
Subject: SONAR-17815 Small text changes

---
 .../js/apps/quality-gates/components/Conditions.tsx     | 17 +++++++----------
 .../components/__tests__/QualityGate-it.tsx             |  8 ++++++--
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'server')

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.tsx
index 8ad2cf00593..7da4afdb0fb 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.tsx
@@ -177,21 +177,18 @@ export class Conditions extends React.PureComponent<Props, State> {
             </h4>
             <div className="cayc-warning-description">
               <FormattedMessage
-                id="quality_gates.cayc.banner.description"
-                defaultMessage={translate('quality_gates.cayc.banner.description')}
+                id="quality_gates.cayc.banner.description1"
+                defaultMessage={translate('quality_gates.cayc.banner.description1')}
                 values={{
                   cayc_link: (
                     <DocLink to="/user-guide/clean-as-you-code/">
                       {translate('quality_gates.cayc')}
                     </DocLink>
                   ),
-                  new_code_link: (
-                    <DocLink to="/project-administration/defining-new-code/">
-                      {translate('quality_gates.cayc.new_code')}
-                    </DocLink>
-                  ),
                 }}
               />
+              <br />
+              {translate('quality_gates.cayc.banner.description2')}
             </div>
             <ul className="big-spacer-top big-spacer-left spacer-bottom cayc-warning-description">
               <li>{translate('quality_gates.cayc.banner.list_item1')}</li>
@@ -199,6 +196,7 @@ export class Conditions extends React.PureComponent<Props, State> {
               <li>{translate('quality_gates.cayc.banner.list_item3')}</li>
               <li>{translate('quality_gates.cayc.banner.list_item4')}</li>
               <li>{translate('quality_gates.cayc.banner.list_item5')}</li>
+              <li>{translate('quality_gates.cayc.banner.list_item6')}</li>
             </ul>
           </Alert>
         )}
@@ -208,11 +206,10 @@ export class Conditions extends React.PureComponent<Props, State> {
             <h4 className="spacer-bottom cayc-over-compliant-header">
               {translate('quality_gates.cayc_over_compliant.banner.title')}
             </h4>
-            <p>{translate('quality_gates.cayc_over_compliant.banner.description1')}</p>
             <div className="cayc-warning-description spacer-top">
               <FormattedMessage
-                id="quality_gates.cayc_over_compliant.banner.description2"
-                defaultMessage={translate('quality_gates.cayc_over_compliant.banner.description2')}
+                id="quality_gates.cayc_over_compliant.banner.description"
+                defaultMessage={translate('quality_gates.cayc_over_compliant.banner.description')}
                 values={{
                   link: (
                     <DocLink to="/user-guide/clean-as-you-code/#potential-drawbacks">
diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/QualityGate-it.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/QualityGate-it.tsx
index 86681808d32..c50a17e3ce7 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/QualityGate-it.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/QualityGate-it.tsx
@@ -356,7 +356,9 @@ it('should show success banner when quality gate is CAYC compliant', async () =>
   await user.click(qualityGate);
 
   expect(screen.getByText('quality_gates.cayc.banner.title')).toBeInTheDocument();
-  expect(screen.getByText('quality_gates.cayc.banner.description')).toBeInTheDocument();
+  expect(
+    screen.getByText('quality_gates.cayc.banner.description1', { exact: false })
+  ).toBeInTheDocument();
   expect(
     screen.queryByText('quality_gates.cayc_condition.missing_warning.title')
   ).not.toBeInTheDocument();
@@ -384,7 +386,9 @@ it('should show info banner when quality gate is CAYC over-compliant', async ()
   await user.click(qualityGate);
 
   expect(screen.getByText('quality_gates.cayc.banner.title')).toBeInTheDocument();
-  expect(screen.getByText('quality_gates.cayc.banner.description')).toBeInTheDocument();
+  expect(
+    screen.getByText('quality_gates.cayc.banner.description1', { exact: false })
+  ).toBeInTheDocument();
   expect(screen.getByText('quality_gates.cayc_over_compliant.banner.title')).toBeInTheDocument();
   expect(
     screen.queryByText('quality_gates.cayc_condition.missing_warning.title')
-- 
cgit v1.2.3