OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix review comments from Šimon Brandner. 

Rename test->it; Rename users->userIds; Un-break a line.
Signed-off-by: Andy Balaam <andyb@element.io>
pull/21833/head
Andy Balaam 2021-10-04 11:41:09 +01:00
parent 226131409f
commit e8dba59b42
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/components/views/rooms/RoomHeader-test.tsx
View File

@ -17,9 +17,9 @@ import { PlaceCallType } from '../../../../src/CallHandler';
import { mkEvent } from '../../../test-utils'; import { mkEvent } from '../../../test-utils';
describe('RoomHeader', () => { describe('RoomHeader', () => {
test('shows the room avatar in a room with only ourselves', () => { it('shows the room avatar in a room with only ourselves', () => {
// When we render a non-DM room with 1 person in it // When we render a non-DM room with 1 person in it
const room = createRoom({ name: "X Room", isDm: false, users: [] }); const room = createRoom({ name: "X Room", isDm: false, userIds: [] });
const rendered = render(room); const rendered = render(room);
// Then the room's avatar is the initial of its name // Then the room's avatar is the initial of its name
@ -31,10 +31,10 @@ describe('RoomHeader', () => {
expect(image.src).toEqual("data:image/png;base64,00"); expect(image.src).toEqual("data:image/png;base64,00");
}); });
test('shows the room avatar in a room with 2 people', () => { it('shows the room avatar in a room with 2 people', () => {
// When we render a non-DM room with 2 people in it // When we render a non-DM room with 2 people in it
const room = createRoom( const room = createRoom(
{ name: "Y Room", isDm: false, users: ["other"] }); { name: "Y Room", isDm: false, userIds: ["other"] });
const rendered = render(room); const rendered = render(room);
// Then the room's avatar is the initial of its name // Then the room's avatar is the initial of its name
@ -46,10 +46,10 @@ describe('RoomHeader', () => {
expect(image.src).toEqual("data:image/png;base64,00"); expect(image.src).toEqual("data:image/png;base64,00");
}); });
test('shows the room avatar in a room with >2 people', () => { it('shows the room avatar in a room with >2 people', () => {
// When we render a non-DM room with 3 people in it // When we render a non-DM room with 3 people in it
const room = createRoom( const room = createRoom(
{ name: "Z Room", isDm: false, users: ["other1", "other2"] }); { name: "Z Room", isDm: false, userIds: ["other1", "other2"] });
const rendered = render(room); const rendered = render(room);
// Then the room's avatar is the initial of its name // Then the room's avatar is the initial of its name
@ -61,9 +61,9 @@ describe('RoomHeader', () => {
expect(image.src).toEqual("data:image/png;base64,00"); expect(image.src).toEqual("data:image/png;base64,00");
}); });
test('shows the room avatar in a DM with only ourselves', () => { it('shows the room avatar in a DM with only ourselves', () => {
// When we render a non-DM room with 1 person in it // When we render a non-DM room with 1 person in it
const room = createRoom({ name: "Z Room", isDm: true, users: [] }); const room = createRoom({ name: "Z Room", isDm: true, userIds: [] });
const rendered = render(room); const rendered = render(room);
// Then the room's avatar is the initial of its name // Then the room's avatar is the initial of its name
@ -75,13 +75,12 @@ describe('RoomHeader', () => {
expect(image.src).toEqual("data:image/png;base64,00"); expect(image.src).toEqual("data:image/png;base64,00");
}); });
test('shows the user avatar in a DM with 2 people', () => { it('shows the user avatar in a DM with 2 people', () => {
// Note: this is the interesting case - this is the ONLY // Note: this is the interesting case - this is the ONLY
// time we should use the user's avatar. // time we should use the user's avatar.
// When we render a DM room with only 2 people in it // When we render a DM room with only 2 people in it
const room = createRoom( const room = createRoom({ name: "Y Room", isDm: true, userIds: ["other"] });
{ name: "Y Room", isDm: true, users: ["other"] });
const rendered = render(room); const rendered = render(room);
// Then we use the other user's avatar as our room's image avatar // Then we use the other user's avatar as our room's image avatar
@ -95,10 +94,10 @@ describe('RoomHeader', () => {
).toHaveLength(0); ).toHaveLength(0);
}); });
test('shows the room avatar in a DM with >2 people', () => { it('shows the room avatar in a DM with >2 people', () => {
// When we render a DM room with 3 people in it // When we render a DM room with 3 people in it
const room = createRoom({ const room = createRoom({
name: "Z Room", isDm: true, users: ["other1", "other2"] }); name: "Z Room", isDm: true, userIds: ["other1", "other2"] });
const rendered = render(room); const rendered = render(room);
// Then the room's avatar is the initial of its name // Then the room's avatar is the initial of its name
@ -114,7 +113,7 @@ describe('RoomHeader', () => {
interface IRoomCreationInfo { interface IRoomCreationInfo {
name: string; name: string;
isDm: boolean; isDm: boolean;
users: string[]; userIds: string[];
} }
function createRoom(info: IRoomCreationInfo) { function createRoom(info: IRoomCreationInfo) {
@ -126,7 +125,7 @@ function createRoom(info: IRoomCreationInfo) {
if (info.isDm) { if (info.isDm) {
client.getAccountData = (eventType) => { client.getAccountData = (eventType) => {
expect(eventType).toEqual("m.direct"); expect(eventType).toEqual("m.direct");
return mkDirectEvent(roomId, userId, info.users); return mkDirectEvent(roomId, userId, info.userIds);
}; };
} }
@ -137,7 +136,7 @@ function createRoom(info: IRoomCreationInfo) {
}); });
const otherJoinEvents = []; const otherJoinEvents = [];
for (const otherUserId of info.users) { for (const otherUserId of info.userIds) {
otherJoinEvents.push(mkJoinEvent(roomId, otherUserId)); otherJoinEvents.push(mkJoinEvent(roomId, otherUserId));
} }