Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OS dependency added to some E2E tests #245

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
"jest-canvas-mock": "^2.3.1",
"jest-css-modules-transform": "^4.2.1",
"jest-dom": "^4.0.0",
"jest-os-detection": "^1.3.1",
"jest-styled-components": "^7.0.4",
"moment-range": "^4.0.2",
"next": "^10.0.3",
Expand Down
12 changes: 6 additions & 6 deletions renderer/components/AutorunConfirmation.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ const AutorunConfirmation = ({ show, onClose }) => {
return (
<Modal width='60%' show={show}>
<StyledCloseButton onClick={onClose}><MdClose size={24} /></StyledCloseButton>
<Container>
<Heading h={4} my={3} textAlign='center'>
<Container data-testid='modal-autorun-confirmation'>
<Heading h={4} my={3} textAlign='center' data-testid='heading-autorun-confirmation'>
<FormattedMessage id='Modal.Autorun.Modal.Title' />
</Heading>
<Flex>
<Flex data-testid='text-autorun-confirmation'>
<FormattedMarkdownMessage id='Modal.Autorun.Modal.Text' />
</Flex>
<Flex justifyContent='flex-end' my={3}>
<Button ml={2} inverted onClick={onCancel}>
<Button ml={2} inverted onClick={onCancel} data-testid='button-autorun-no'>
<strong><FormattedMessage id='Modal.NoThanks' /></strong>
</Button>
<Button ml={2} inverted onClick={onRemindLater}>
<Button ml={2} inverted onClick={onRemindLater} data-testid='button-autorun-remind-later'>
<strong><FormattedMessage id='Modal.Autorun.Modal.Button.RemindLater' /></strong>
</Button>
<Button ml={2} onClick={onConfirm}>
<Button ml={2} onClick={onConfirm} data-testid='button-autorun-yes'>
<strong><FormattedMessage id='Modal.SoundsGreat' /></strong>
</Button>
</Flex>
Expand Down
2 changes: 1 addition & 1 deletion renderer/components/settings/widgets.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const BooleanOption = ({ label, optionKey, disabled = false, ...rest }) =
<Checkbox
mr={1}
className='checkbox'
data-testid={optionKey}
data-testid={optionKey ? optionKey.split('.')[1] : ''}
checked={checked}
onChange={handleChange}
disabled={disabled}
Expand Down
1 change: 1 addition & 0 deletions renderer/pages/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ const Settings = () => {
<AutorunCheckbox
label={<FormattedMessage id='Settings.AutomatedTesting.RunAutomatically' />}
optionKey='autorun.enabled'
data-testid='checkbox-autorun'
/>
<Text as='small'><em><FormattedMarkdownMessage id='Settings.AutomatedTesting.RunAutomatically.Footer' /></em></Text>
</Section>
Expand Down
Loading