SONAR-18960 Rework it-license selenium tests

diff --git a/server/sonar-web/src/main/js/app/components/nav/component/AnalysisErrorModal.tsx b/server/sonar-web/src/main/js/app/components/nav/component/AnalysisErrorModal.tsx
index 46dc0f75861e4a1c54d751e04d0130f80708a7ad..bd3687844217816d15873d612c36c61688a13b9a 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/nav/component/AnalysisErrorModal.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/AnalysisErrorModal.tsx
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import { ButtonLink } from '../../../../components/controls/buttons';
 import Modal from '../../../../components/controls/Modal';
+import { ResetButtonLink } from '../../../../components/controls/buttons';
 import { hasMessage, translate } from '../../../../helpers/l10n';
 import { Task } from '../../../../types/tasks';
 import { Component } from '../../../../types/types';
@@ -62,9 +62,7 @@ export function AnalysisErrorModal(props: Props) {
       </div>
 
       <footer className="modal-foot">
-        <ButtonLink className="js-modal-close" onClick={props.onClose}>
-          {translate('close')}
-        </ButtonLink>
+        <ResetButtonLink onClick={props.onClose}>{translate('close')}</ResetButtonLink>
       </footer>
     </Modal>
   );

diff --git a/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx b/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx
index b3400a47a13e5721cc533eb702476f3c90b9b67e..78759159f669ed1201fcc4d9a7c6e171866f81fb 100644 (file)
--- a/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx
+++ b/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx
@@ -20,8 +20,8 @@
 import * as React from 'react';
 import { dismissAnalysisWarning, getTask } from '../../api/ce';
 import withCurrentUserContext from '../../app/components/current-user/withCurrentUserContext';
-import { ButtonLink } from '../../components/controls/buttons';
 import Modal from '../../components/controls/Modal';
+import { ButtonLink, ResetButtonLink } from '../../components/controls/buttons';
 import WarningIcon from '../../components/icons/WarningIcon';
 import DeferredSpinner from '../../components/ui/DeferredSpinner';
 import { translate } from '../../helpers/l10n';
@@ -162,9 +162,7 @@ export class AnalysisWarningsModal extends React.PureComponent<Props, State> {
         </div>
 
         <footer className="modal-foot">
-          <ButtonLink className="js-modal-close" onClick={this.props.onClose}>
-            {translate('close')}
-          </ButtonLink>
+          <ResetButtonLink onClick={this.props.onClose}>{translate('close')}</ResetButtonLink>
         </footer>
       </Modal>
     );

diff --git a/server/sonar-web/src/main/js/components/common/__tests__/__snapshots__/AnalysisWarningsModal-test.tsx.snap b/server/sonar-web/src/main/js/components/common/__tests__/__snapshots__/AnalysisWarningsModal-test.tsx.snap
index 2f0e5304c2fcce0bbcf3cd107bbc034c8de813d6..664b51a100b3dd54f93a04092d64959df45fa32a 100644 (file)
--- a/server/sonar-web/src/main/js/components/common/__tests__/__snapshots__/AnalysisWarningsModal-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/common/__tests__/__snapshots__/AnalysisWarningsModal-test.tsx.snap
@@ -82,12 +82,11 @@ secondline
   <footer
     className="modal-foot"
   >
-    <ButtonLink
-      className="js-modal-close"
+    <ResetButtonLink
       onClick={[MockFunction]}
     >
       close
-    </ButtonLink>
+    </ResetButtonLink>
   </footer>
 </Modal>
 `;
@@ -153,12 +152,11 @@ exports[`should render correctly: default 1`] = `
   <footer
     className="modal-foot"
   >
-    <ButtonLink
-      className="js-modal-close"
+    <ResetButtonLink
       onClick={[MockFunction]}
     >
       close
-    </ButtonLink>
+    </ResetButtonLink>
   </footer>
 </Modal>
 `;
@@ -205,12 +203,11 @@ exports[`should render correctly: do not show dismissable links for anonymous 1`
   <footer
     className="modal-foot"
   >
-    <ButtonLink
-      className="js-modal-close"
+    <ResetButtonLink
       onClick={[MockFunction]}
     >
       close
-    </ButtonLink>
+    </ResetButtonLink>
   </footer>
 </Modal>
 `;
@@ -267,12 +264,11 @@ exports[`should render correctly: with dismissable warnings 1`] = `
   <footer
     className="modal-foot"
   >
-    <ButtonLink
-      className="js-modal-close"
+    <ResetButtonLink
       onClick={[MockFunction]}
     >
       close
-    </ButtonLink>
+    </ResetButtonLink>
   </footer>
 </Modal>
 `;