forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 184
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-s…
…oc/merge-upstream Conflicts: - `Gemfile.lock`: Conflict because we had updated the `json-ld` gem to fix a yanked dependency. Kept our version of `json-ld` while updating other dependencies.
- Loading branch information
Showing
45 changed files
with
788 additions
and
1,060 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
app/javascript/mastodon/features/__tests__/toggle-play.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| import PropTypes from 'prop-types'; | ||
| import React, { Component } from 'react'; | ||
|
|
||
| import { render, fireEvent } from '@testing-library/react'; | ||
|
|
||
| class Media extends Component { | ||
|
|
||
| constructor(props) { | ||
| super(props); | ||
|
|
||
| this.state = { | ||
| paused: props.paused || false, | ||
| }; | ||
| } | ||
|
|
||
| handleMediaClick = () => { | ||
| const { onClick } = this.props; | ||
|
|
||
| this.setState(prevState => ({ | ||
| paused: !prevState.paused, | ||
| })); | ||
|
|
||
| if (typeof onClick === 'function') { | ||
| onClick(); | ||
| } | ||
|
|
||
| const { title } = this.props; | ||
| const mediaElements = document.querySelectorAll(`div[title="${title}"]`); | ||
|
|
||
| setTimeout(() => { | ||
| mediaElements.forEach(element => { | ||
| if (element !== this && !element.classList.contains('paused')) { | ||
| element.click(); | ||
| } | ||
| }); | ||
| }, 0); | ||
| }; | ||
|
|
||
| render() { | ||
| const { title } = this.props; | ||
| const { paused } = this.state; | ||
|
|
||
| return ( | ||
| <button title={title} onClick={this.handleMediaClick}> | ||
| Media Component - {paused ? 'Paused' : 'Playing'} | ||
| </button> | ||
| ); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| Media.propTypes = { | ||
| title: PropTypes.string.isRequired, | ||
| onClick: PropTypes.func, | ||
| paused: PropTypes.bool, | ||
| }; | ||
|
|
||
| describe('Media attachments test', () => { | ||
| let currentMedia = null; | ||
| const togglePlayMock = jest.fn(); | ||
|
|
||
| it('plays a new media file and pauses others that were playing', () => { | ||
| const container = render( | ||
| <div> | ||
| <Media title='firstMedia' paused onClick={togglePlayMock} /> | ||
| <Media title='secondMedia' paused onClick={togglePlayMock} /> | ||
| </div>, | ||
| ); | ||
|
|
||
| fireEvent.click(container.getByTitle('firstMedia')); | ||
| expect(togglePlayMock).toHaveBeenCalledTimes(1); | ||
| currentMedia = container.getByTitle('firstMedia'); | ||
| expect(currentMedia.textContent).toMatch(/Playing/); | ||
|
|
||
| fireEvent.click(container.getByTitle('secondMedia')); | ||
| expect(togglePlayMock).toHaveBeenCalledTimes(2); | ||
| currentMedia = container.getByTitle('secondMedia'); | ||
| expect(currentMedia.textContent).toMatch(/Playing/); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.