mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-26 19:26:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add room context to test

Browse source
This commit is contained in:
J. Ryan Stinnett 2019-07-31 11:17:24 +01:00
parent ddf558b3ed
commit c338f8bf1f
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/messages/MessageActionBar.js
View file

@ -145,12 +145,10 @@ export default class MessageActionBar extends React.PureComponent {
let editButton; let editButton;
if (isContentActionable(this.props.mxEvent)) { if (isContentActionable(this.props.mxEvent)) {
// `context` can be null in tests that use a subtree of components if (this.context.room.canReact) {
// that don't create the context.
if (!this.context || !this.context.room || this.context.room.canReact) {
reactButton = this.renderReactButton(); reactButton = this.renderReactButton();
} }
if (!this.context || !this.context.room || this.context.room.canReply) { if (this.context.room.canReply) {
replyButton = <span className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton" replyButton = <span className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"
title={_t("Reply")} title={_t("Reply")}
onClick={this.onReplyClick} onClick={this.onReplyClick}

5
test/components/structures/MessagePanel-test.js
View file

@ -41,11 +41,16 @@ const room = new Matrix.Room();
const WrappedMessagePanel = React.createClass({ const WrappedMessagePanel = React.createClass({
childContextTypes: { childContextTypes: {
matrixClient: React.PropTypes.object, matrixClient: React.PropTypes.object,
room: React.PropTypes.object,
}, },
getChildContext: function() { getChildContext: function() {
return { return {
matrixClient: client, matrixClient: client,
room: {
canReact: true,
canReply: true,
},
}; };
}, },