imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into travis/remove-skinning

Browse source
This commit is contained in:
Travis Ralston 2022-03-31 19:25:43 -06:00
commit 97efdf7094
54 changed files with 1559 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/components/views/rooms/RoomPreviewBar-test.tsx
View file

@ -107,7 +107,7 @@ describe('<RoomPreviewBar />', () => {
const component = getComponent({ joining: true });
expect(isSpinnerRendered(component)).toBeTruthy();
expect(getMessage(component).textContent).toEqual('Joining room …');
expect(getMessage(component).textContent).toEqual('Joining …');
});
it('renders rejecting message', () => {
const component = getComponent({ rejecting: true });

8
test/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
View file

@ -54,11 +54,11 @@ exports[`<RoomPreviewBar /> with an error renders other errors 1`] = `
RoomPreviewBar-test-room is not accessible at this time.
</h3>
<p>
Try again later, or ask a room admin to check if you have access.
Try again later, or ask a room or space admin to check if you have access.
</p>
<p>
<span>
Something_else was returned while trying to access the room. If you think you're seeing this message in error, please
Something_else was returned while trying to access the room or space. If you think you're seeing this message in error, please
<a
href="https://github.com/vector-im/element-web/issues/new/choose"
rel="noreferrer noopener"
@ -80,7 +80,7 @@ exports[`<RoomPreviewBar /> with an error renders room not found error 1`] = `
RoomPreviewBar-test-room does not exist.
</h3>
<p>
This room doesn't exist. Are you sure you're at the right place?
Are you sure you're at the right place?
</p>
</div>
`;
@ -93,7 +93,7 @@ exports[`<RoomPreviewBar /> with an invite with an invited email when client fai
Something went wrong with your invite to RoomPreviewBar-test-room
</h3>
<p>
An error (unknown error code) was returned while trying to validate your invite. You could try to pass this information on to a room admin.
An error (unknown error code) was returned while trying to validate your invite. You could try to pass this information on to the person who invited you.
</p>
</div>
`;