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

Merge branch 'develop' into Bubble-bericht

Browse source
This commit is contained in:
Ayush PS 2021-05-07 18:32:38 +05:30
parent f367d617c5
commit c843387043
264 changed files with 7383 additions and 3268 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test/components/views/dialogs/AccessSecretStorageDialog-test.js
View file

@ -26,9 +26,9 @@ describe("AccessSecretStorageDialog", function() {
it("Closes the dialog if _onRecoveryKeyNext is called with a valid key", (done) => {
const testInstance = TestRenderer.create(
<AccessSecretStorageDialog
checkPrivateKey={(p) => p && p.recoveryKey && p.recoveryKey == "a"}
onFinished={(v) => {
if (v) { done(); }
checkPrivateKey={(p) => p && p.recoveryKey && p.recoveryKey == "a"}
onFinished={(v) => {
if (v) { done(); }
}}
/>,
);
@ -43,7 +43,7 @@ describe("AccessSecretStorageDialog", function() {
it("Considers a valid key to be valid", async function() {
const testInstance = TestRenderer.create(
<AccessSecretStorageDialog
checkPrivateKey={() => true}
checkPrivateKey={() => true}
/>,
);
const v = "asdf";
@ -61,7 +61,7 @@ describe("AccessSecretStorageDialog", function() {
it("Notifies the user if they input an invalid Security Key", async function(done) {
const testInstance = TestRenderer.create(
<AccessSecretStorageDialog
checkPrivateKey={async () => false}
checkPrivateKey={async () => false}
/>,
);
const e = { target: { value: "a" } };
@ -87,12 +87,14 @@ describe("AccessSecretStorageDialog", function() {
it("Notifies the user if they input an invalid passphrase", async function(done) {
const testInstance = TestRenderer.create(
<AccessSecretStorageDialog
checkPrivateKey={() => false}
onFinished={() => {}}
keyInfo={ { passphrase: {
salt: 'nonempty',
iterations: 2,
} } }
checkPrivateKey={() => false}
onFinished={() => {}}
keyInfo={{
passphrase: {
salt: 'nonempty',
iterations: 2,
},
}}
/>,
);
const e = { target: { value: "a" } };

9
test/components/views/elements/MemberEventListSummary-test.js
View file

@ -245,8 +245,7 @@ describe('MemberEventListSummary', function() {
);
});
it('truncates multiple sequences of repetitions with other events between',
function() {
it('truncates multiple sequences of repetitions with other events between', function() {
const events = generateEvents([
{
userId: "@user_1:some.domain",
@ -395,8 +394,7 @@ describe('MemberEventListSummary', function() {
);
});
it('correctly orders sequences of transitions by the order of their first event',
function() {
it('correctly orders sequences of transitions by the order of their first event', function() {
const events = generateEvents([
{
userId: "@user_2:some.domain",
@ -568,8 +566,7 @@ describe('MemberEventListSummary', function() {
);
});
it('handles invitation plurals correctly when there are multiple invites',
function() {
it('handles invitation plurals correctly when there are multiple invites', function() {
const events = generateEvents([
{
userId: "@user_1:some.domain",

2
test/components/views/rooms/MemberList-test.js
View file

@ -100,7 +100,7 @@ describe('MemberList', () => {
memberList = r;
};
root = ReactDOM.render(<WrappedMemberList roomId={memberListRoom.roomId}
wrappedRef={gatherWrappedRef} />, parentDiv);
wrappedRef={gatherWrappedRef} />, parentDiv);
});
afterEach((done) => {

10
test/components/views/rooms/RoomList-test.js
View file

@ -29,7 +29,10 @@ function waitForRoomListStoreUpdate() {
describe('RoomList', () => {
function createRoom(opts) {
const room = new Room(generateRoomId(), null, client.getUserId());
const room = new Room(generateRoomId(), MatrixClientPeg.get(), client.getUserId(), {
// The room list now uses getPendingEvents(), so we need a detached ordering.
pendingEventOrdering: "detached",
});
if (opts) {
Object.assign(room, opts);
}
@ -67,8 +70,9 @@ describe('RoomList', () => {
root = ReactDOM.render(
<DragDropContext>
<WrappedRoomList searchFilter="" onResize={() => {}} />
</DragDropContext>
, parentDiv);
</DragDropContext>,
parentDiv,
);
ReactTestUtils.findRenderedComponentWithType(root, RoomList);
movingRoom = createRoom({name: 'Moving room'});