Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the tests

Browse Source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-11-05 14:56:41 -07:00
parent f0000f7400
commit 10519f9465
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/structures/MatrixChat.js
View File

@ -1096,12 +1096,14 @@ module.exports = React.createClass({
krh.handleKeyRequestCancellation(req);
});
cli.on("Room", (room) => {
const blacklistEnabled = SettingsStore.getValueAt(
SettingLevel.ROOM_DEVICE,
"blacklistUnverifiedDevices",
room.roomId,
);
room.setBlacklistUnverifiedDevices(blacklistEnabled);
if (MatrixClientPeg.get().isCryptoEnabled()) {
const blacklistEnabled = SettingsStore.getValueAt(
SettingLevel.ROOM_DEVICE,
"blacklistUnverifiedDevices",
room.roomId,
);
room.setBlacklistUnverifiedDevices(blacklistEnabled);
}
});
},
@ -1113,11 +1115,13 @@ module.exports = React.createClass({
_onClientStarted: function() {
const cli = MatrixClientPeg.get();
const blacklistEnabled = SettingsStore.getValueAt(
SettingLevel.DEVICE,
"blacklistUnverifiedDevices"
);
cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
if (cli.isCryptoEnabled()) {
const blacklistEnabled = SettingsStore.getValueAt(
SettingLevel.DEVICE,
"blacklistUnverifiedDevices"
);
cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
}
},
showScreen: function(screen, params) {

4
src/settings/handlers/LocalEchoWrapper.js
View File

@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import Promise from "bluebird";
import SettingsHandler from "./SettingsHandler";
/**
@ -51,7 +52,8 @@ export default class LocalEchoWrapper extends SettingsHandler {
const cacheRoomId = roomId ? roomId : "UNDEFINED"; // avoid weird keys
bySetting[cacheRoomId] = newValue;
return this._handler.setValue(settingName, roomId, newValue).finally(() => {
const handlerPromise = this._handler.setValue(settingName, roomId, newValue);
return Promise.resolve(handlerPromise).finally(() => {
delete bySetting[cacheRoomId];
});
}

1
test/components/structures/MessagePanel-test.js
View File

@ -62,7 +62,6 @@ describe('MessagePanel', function() {
client.credentials = {userId: '@me:here'};
// HACK: We assume all settings want to be disabled
// TODO: {Travis} Run the tests to verify this works
SettingsStore.getValue = sinon.stub().returns(false);
});