diff --git a/src/web/components/bar/compliancebar.jsx b/src/web/components/bar/compliancebar.jsx index 9f17e89fc9..158a101e74 100644 --- a/src/web/components/bar/compliancebar.jsx +++ b/src/web/components/bar/compliancebar.jsx @@ -30,7 +30,7 @@ const ComplianceBar = ({compliance, toolTip}) => { const toolTipText = isDefined(toolTip) ? toolTip : title; return ( - + {title} ); diff --git a/src/web/components/bar/compliancestatusbar.jsx b/src/web/components/bar/compliancestatusbar.jsx index 16917b57f2..0de33f3000 100644 --- a/src/web/components/bar/compliancestatusbar.jsx +++ b/src/web/components/bar/compliancestatusbar.jsx @@ -30,6 +30,7 @@ const ComplianceStatusBar = ({complianceStatus}) => { progress={complianceStatus} background={Theme.statusRunGreen} boxBackground={boxBackground} + data-testid="progress-bar" > {text} diff --git a/src/web/components/bar/menubar.jsx b/src/web/components/bar/menubar.jsx index 388586c6b0..e3cd63f36a 100644 --- a/src/web/components/bar/menubar.jsx +++ b/src/web/components/bar/menubar.jsx @@ -114,137 +114,140 @@ const MenuBar = ({isLoggedIn}) => { diff --git a/src/web/components/bar/severitybar.jsx b/src/web/components/bar/severitybar.jsx index 3fa6dca090..676e593242 100644 --- a/src/web/components/bar/severitybar.jsx +++ b/src/web/components/bar/severitybar.jsx @@ -60,7 +60,7 @@ const SeverityBar = ({severity, toolTip}) => { const toolTipText = isDefined(toolTip) ? toolTip : title; return ( - + {text} ); diff --git a/src/web/components/bar/statusbar.jsx b/src/web/components/bar/statusbar.jsx index fe8371e8bc..bc35ddb1e1 100644 --- a/src/web/components/bar/statusbar.jsx +++ b/src/web/components/bar/statusbar.jsx @@ -79,7 +79,7 @@ const StatusBar = ({status = 'Unknown', progress = '0'}) => { : getTranslatableTaskStatus(status); return ( - + {text} ); diff --git a/src/web/components/bar/toolbar.jsx b/src/web/components/bar/toolbar.jsx index eb439147eb..564f3257ef 100644 --- a/src/web/components/bar/toolbar.jsx +++ b/src/web/components/bar/toolbar.jsx @@ -18,6 +18,7 @@ const Toolbar = props => { align={['space-between', 'start']} {...props} className="toolbar" + data-testid="toolbar" /> ); diff --git a/src/web/components/certinfo/certinfo.jsx b/src/web/components/certinfo/certinfo.jsx index 926d691d2c..f7e7c923d6 100644 --- a/src/web/components/certinfo/certinfo.jsx +++ b/src/web/components/certinfo/certinfo.jsx @@ -29,9 +29,9 @@ const CertInfo = ({info}) => { - - {_('Activation')} - + + {_('Activation')} + {isDefined(activationTime) ? ( ) : ( @@ -40,9 +40,9 @@ const CertInfo = ({info}) => { - - {_('Expiration')} - + + {_('Expiration')} + {isDefined(expirationTime) ? ( ) : ( @@ -51,14 +51,14 @@ const CertInfo = ({info}) => { - - {_('MD5 Fingerprint')} - {md5_fingerprint} + + {_('MD5 Fingerprint')} + {md5_fingerprint} - - {_('Issuer')} - {issuer} + + {_('Issuer')} + {issuer} diff --git a/src/web/components/comment/comment.jsx b/src/web/components/comment/comment.jsx index 45b69547d9..d56c6d5319 100644 --- a/src/web/components/comment/comment.jsx +++ b/src/web/components/comment/comment.jsx @@ -17,7 +17,7 @@ const Comment = ({text, children}) => { if (!isDefined(text)) { return null; } - return
{text}
; + return
{text}
; }; Comment.propTypes = { diff --git a/src/web/components/dashboard/controls.jsx b/src/web/components/dashboard/controls.jsx index 72ff0f9eb5..8d0f4b1a30 100644 --- a/src/web/components/dashboard/controls.jsx +++ b/src/web/components/dashboard/controls.jsx @@ -119,10 +119,12 @@ export class DashboardControls extends React.Component { : _('Dashboard limit reached') } onClick={canAdd ? this.handleNewClick : undefined} + data-testid="add_new_dashboard" /> {showNewDialog && ( @@ -136,6 +138,7 @@ export class DashboardControls extends React.Component { }} onClose={this.handleNewDialogClose} onSave={this.handleNewDisplay} + data-testid="save_dialog_add" > {({values, onValueChange}) => ( @@ -145,6 +148,7 @@ export class DashboardControls extends React.Component { value={values.displayId} width="auto" onChange={onValueChange} + data-testid="display_id" /> )} diff --git a/src/web/components/dialog/button.jsx b/src/web/components/dialog/button.jsx index 35aa3ab355..d0109bce47 100644 --- a/src/web/components/dialog/button.jsx +++ b/src/web/components/dialog/button.jsx @@ -11,7 +11,7 @@ import Button from 'web/components/form/button'; import Theme from 'web/utils/theme'; -const DialogButton = styled(({loading, ...props}) =>