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

Merge branch 'develop' into new-guest-access

Browse source
This commit is contained in:
Matthew Hodgson 2017-05-28 22:58:18 +01:00
commit 5c885922d9
90 changed files with 5814 additions and 831 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/components/views/dialogs/InteractiveAuthDialog-test.js
View file

@ -22,7 +22,7 @@ import ReactTestUtils from 'react-addons-test-utils';
import sinon from 'sinon';
import sdk from 'matrix-react-sdk';
import MatrixClientPeg from 'MatrixClientPeg';
import MatrixClientPeg from '../../../../src/MatrixClientPeg';
import * as test_utils from '../../../test-utils';

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

@ -4,6 +4,7 @@ const ReactDOM = require("react-dom");
const ReactTestUtils = require('react-addons-test-utils');
const sdk = require('matrix-react-sdk');
const MemberEventListSummary = sdk.getComponent('views.elements.MemberEventListSummary');
import * as languageHandler from '../../../../src/languageHandler';
const testUtils = require('../../../test-utils');
describe('MemberEventListSummary', function() {
@ -82,9 +83,11 @@ describe('MemberEventListSummary', function() {
return eventsForUsers;
};
beforeEach(function() {
beforeEach(function(done) {
testUtils.beforeEach(this);
sandbox = testUtils.stubClient();
languageHandler.setLanguage('en').done(done);
});
afterEach(function() {
@ -356,7 +359,7 @@ describe('MemberEventListSummary', function() {
const summaryText = summary.innerText;
expect(summaryText).toBe(
"user_1 and 1 other were unbanned, joined and left 2 times and were banned"
"user_1 and one other were unbanned, joined and left 2 times and were banned"
);
});
@ -559,7 +562,7 @@ describe('MemberEventListSummary', function() {
const summaryText = summary.innerText;
expect(summaryText).toBe(
"user_1 and 1 other rejected their invitations and " +
"user_1 and one other rejected their invitations and " +
"had their invitations withdrawn"
);
});
@ -595,7 +598,7 @@ describe('MemberEventListSummary', function() {
const summaryText = summary.innerText;
expect(summaryText).toBe(
"user_1 rejected their invitations 2 times"
"user_1 rejected their invitation 2 times"
);
});
@ -650,7 +653,7 @@ describe('MemberEventListSummary', function() {
const summaryText = summary.innerText;
expect(summaryText).toBe(
"user_1, user_2 and 1 other joined"
"user_1, user_2 and one other joined"
);
});

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

@ -8,7 +8,7 @@ import * as testUtils from '../../../test-utils';
import sdk from 'matrix-react-sdk';
import UserSettingsStore from '../../../../src/UserSettingsStore';
const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
import MatrixClientPeg from 'MatrixClientPeg';
import MatrixClientPeg from '../../../../src/MatrixClientPeg';
function addTextToDraft(text) {
const components = document.getElementsByClassName('public-DraftEditor-content');