fix(uaa-parity): Fix consecutive version events issue #3828
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,87 @@ | ||
| import * as React from 'react'; | ||
| import { render, screen } from '@testing-library/react'; | ||
| import { IntlProvider } from 'react-intl'; | ||
| import { ACTION_TYPE_CREATED, ACTION_TYPE_RESTORED, ACTION_TYPE_TRASHED } from '../../../../../constants'; | ||
| import CollapsedVersion from '../CollapsedVersion'; | ||
| import selectors from '../../../../common/selectors/version'; | ||
|
|
||
| jest.mock('react-intl', () => ({ | ||
| ...jest.requireActual('react-intl'), | ||
| })); | ||
|
Comment on lines
+8
to
+10
There was a problem hiding this comment. if you import There was a problem hiding this comment. Tests not passing when I do that for some reason . Given this change is a little time-sensitive, I will leave as is. |
||
|
|
||
| describe('elements/content-sidebar/ActivityFeed/version/CollapsedVersion', () => { | ||
| beforeEach(() => { | ||
| selectors.getVersionAction = jest.fn().mockReturnValue('upload'); | ||
| }); | ||
|
|
||
| const intl = { | ||
| formatMessage: jest.fn().mockImplementation(message => message.defaultMessage), | ||
| }; | ||
|
|
||
| const renderComponent = props => | ||
| render( | ||
| <IntlProvider locale="en"> | ||
| <CollapsedVersion | ||
| intl={intl} | ||
| collaborators={{ 1: { name: 'Person one', id: 1 } }} | ||
| version_start={1} | ||
| version_end={10} | ||
| versions={[]} | ||
| id={0} | ||
| {...props} | ||
| /> | ||
| </IntlProvider>, | ||
| ); | ||
|
|
||
| test('should correctly render for single collaborator', () => { | ||
| renderComponent(); | ||
|
|
||
| expect(screen.getByText('Person one')).toBeInTheDocument(); | ||
| expect(screen.getByText('uploaded v')).toBeInTheDocument(); | ||
| expect(screen.getByText('1 - 10')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test('should correctly render for multiple collaborators', () => { | ||
| renderComponent({ | ||
| collaborators: { 1: { name: 'Person one', id: 1 }, 2: { name: 'Person two', id: 2 } }, | ||
| }); | ||
|
|
||
| expect(screen.getByText('2 collaborators uploaded v')).toBeInTheDocument(); | ||
| expect(screen.getByText('1 - 10')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test('should correctly render info icon if onInfo is passed', () => { | ||
| renderComponent({ | ||
| onInfo: () => {}, | ||
| }); | ||
|
|
||
| expect(screen.getByLabelText('Get version information')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test('should not render a message if action is not upload', () => { | ||
| selectors.getVersionAction.mockReturnValueOnce('delete'); | ||
|
|
||
| renderComponent(); | ||
|
|
||
| expect(screen.queryByText('Person one')).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test.each` | ||
| actionType | actionText | ||
| ${ACTION_TYPE_RESTORED} | ${'restored v'} | ||
| ${ACTION_TYPE_TRASHED} | ${'deleted v'} | ||
| ${ACTION_TYPE_CREATED} | ${'uploaded v'} | ||
| `('should correctly render when shouldUseUAA is true with actionType $actionType', ({ actionType, actionText }) => { | ||
| renderComponent({ | ||
| shouldUseUAA: true, | ||
| action_type: actionType, | ||
| action_by: [{ name: 'John Doe', id: 3 }], | ||
| version_start: 2, | ||
| version_end: 4, | ||
| }); | ||
|
|
||
| expect(screen.getByText('John Doe')).toBeInTheDocument(); | ||
| expect(screen.getByText(actionText)).toBeInTheDocument(); | ||
| expect(screen.getByText('2 - 4')).toBeInTheDocument(); | ||
| }); | ||
|
Comment on lines
+69
to
86
There was a problem hiding this comment. Nice, thanks for converting this! |
||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel like a switch here with a default to null would read better as well or invert this gate and default to returning null.