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.

Sign up for GitHub

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

Fixed failed tests after resolving conflicts #704

Merged
merged 1 commit into from
Oct 18, 2019
Merged

Fixed failed tests after resolving conflicts #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cypress/integration/common.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ describe('[Common]', () =>{
cy.step('Logout the session')
cy.step('Logout')
cy.toggleUserMenuOn()
cy.get('[data-cy=menu-item]').contains('Logout').click()
cy.get('[data-cy=menu-item]').contains('Log out').click()
cy.get('[data-cy=login]').should('be.visible')
cy.get('[data-cy=join]').should('be.visible')
})
Expand Down
3 changes: 2 additions & 1 deletion cypress/integration/events.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ describe('[Events]', () => {

cy.step('Fill up mandatory info')
cy.get('[data-cy=title]').type('Create a test event')
cy.get('[data-cy=date]').type(Cypress.moment('2019-08-20').format('YYYY-MM-DD'))
cy.get('[data-cy=date]').find('input').click()
cy.get('.react-datepicker').find('div[role=option]').contains('20').click()
cy.get('[data-cy=tag-select]').click()
cy.get('.data-cy__menu').contains('event_testing').click()

Expand Down
8 changes: 4 additions & 4 deletions src/components/ProfileModal/ProfileModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,22 @@ export class ProfileModal extends React.Component<IProps> {
render() {
const { username } = this.props
return (
<ModalContainer data-cy={'user-menu-list'}>
<ModalContainer data-cy="user-menu-list">
<ModalContent>
<Flex>
<ModalLink to={'/u/' + username}>
<ModalLink to={'/u/' + username} data-cy="menu-item">
<Flex>Profile</Flex>
</ModalLink>
</Flex>
<Flex>
{COMMUNITY_PAGES_PROFILE.map(page => (
<ModalLink key={page.path} to={page.path}>
<ModalLink key={page.path} to={page.path} data-cy="menu-item">
<Flex>{page.title}</Flex>
</ModalLink>
))}
</Flex>
<Flex>
<ModalLink onClick={() => this.logout()} to={'/how-to'}>
<ModalLink onClick={() => this.logout()} to={'/how-to'} data-cy="menu-item">
<Flex color="rgba(27,27,27,0.5)">Log out</Flex>
</ModalLink>
</Flex>
Expand Down
5 changes: 2 additions & 3 deletions src/pages/Events/Content/EventsCreate/EventsCreate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,14 @@ export class EventsCreate extends React.Component<IProps, IState> {
width={1}
flexDirection={['column', 'column', 'row']}
>
<Flex flexDirection={'column'} mb={3} px={2} width={1}>
<Flex flexDirection={'column'} mb={3} px={2} width={1} data-cy="date">
<Label htmlFor="location">
When is your event taking place? *
</Label>
<DatePicker
className="datepicker"
name="date"
type="date"
data-cy="date"
dateFormat="yyyy/MM/dd"
validate={required}
selected={this.state.selectedDate}
Expand Down Expand Up @@ -227,7 +226,7 @@ export class EventsCreate extends React.Component<IProps, IState> {
mt={3}
variant={disabled ? 'primary' : 'primary'}
disabled={submitting || invalid}
data-cy={'submit'}
data-cy="submit"
>
Publish
</Button>
Expand Down