@@ -1097,11 +1097,11 @@ def test_get_latest_message_in_topic(
1097
1097
},
1098
1098
{
1099
1099
"_" : ["User not found" , False ],
1100
- "_owner" : ["Editing messages is disabled" , False ],
1101
- "_admin" : ["Editing messages is disabled" , False ],
1102
- "_moderator" : ["Editing messages is disabled" , False ],
1103
- "_member" : ["Editing messages is disabled" , False ],
1104
- "_guest" : ["Editing messages is disabled" , False ],
1100
+ "_owner" : [" Editing messages is disabled" , False ],
1101
+ "_admin" : [" Editing messages is disabled" , False ],
1102
+ "_moderator" : [" Editing messages is disabled" , False ],
1103
+ "_member" : [" Editing messages is disabled" , False ],
1104
+ "_guest" : [" Editing messages is disabled" , False ],
1105
1105
},
1106
1106
id = "editing_msg_disabled:PreZulip4.0" ,
1107
1107
),
@@ -1114,9 +1114,9 @@ def test_get_latest_message_in_topic(
1114
1114
"_" : ["User not found" , False ],
1115
1115
"_owner" : ["" , True ],
1116
1116
"_admin" : ["" , True ],
1117
- "_moderator" : ["Editing topic is disabled" , False ],
1118
- "_member" : ["Editing topic is disabled" , False ],
1119
- "_guest" : ["Editing topic is disabled" , False ],
1117
+ "_moderator" : [" Editing topic is disabled" , False ],
1118
+ "_member" : [" Editing topic is disabled" , False ],
1119
+ "_guest" : [" Editing topic is disabled" , False ],
1120
1120
},
1121
1121
id = "editing_topic_disabled:PreZulip4.0" ,
1122
1122
),
@@ -1135,18 +1135,6 @@ def test_get_latest_message_in_topic(
1135
1135
},
1136
1136
id = "editing_topic_and_msg_enabled:PreZulip4.0" ,
1137
1137
),
1138
- case (
1139
- {"allow_message_editing" : False , "edit_topic_policy" : 1 },
1140
- {
1141
- "_" : ["User not found" , False ],
1142
- "_owner" : ["Editing messages is disabled" , False ],
1143
- "_admin" : ["Editing messages is disabled" , False ],
1144
- "_moderator" : ["Editing messages is disabled" , False ],
1145
- "_member" : ["Editing messages is disabled" , False ],
1146
- "_guest" : ["Editing messages is disabled" , False ],
1147
- },
1148
- id = "all_but_no_editing:Zulip4.0+:ZFL75" ,
1149
- ),
1150
1138
case (
1151
1139
{"allow_message_editing" : True , "edit_topic_policy" : 1 },
1152
1140
{
@@ -1156,8 +1144,8 @@ def test_get_latest_message_in_topic(
1156
1144
"_moderator" : ["" , True ],
1157
1145
"_member" : ["" , True ],
1158
1146
"_guest" : [
1159
- "Only organization administrators, moderators, full members and "
1160
- " members can edit topic" ,
1147
+ "Only organization administrators, moderators, full members"
1148
+ " and members can edit topic" ,
1161
1149
False ,
1162
1150
],
1163
1151
},
@@ -1208,13 +1196,13 @@ def test_get_latest_message_in_topic(
1208
1196
"_admin" : ["" , True ],
1209
1197
"_moderator" : ["" , True ],
1210
1198
"_member" : [
1211
- "Only organization administrators and moderators"
1212
- " can edit topic" ,
1199
+ "Only organization administrators and moderators can edit "
1200
+ " topic" ,
1213
1201
False ,
1214
1202
],
1215
1203
"_guest" : [
1216
- "Only organization administrators and moderators"
1217
- " can edit topic" ,
1204
+ "Only organization administrators and moderators can edit "
1205
+ " topic" ,
1218
1206
False ,
1219
1207
],
1220
1208
},
@@ -1246,9 +1234,9 @@ def test_can_user_edit_topic(
1246
1234
):
1247
1235
model .get_user_info = mocker .Mock (return_value = user_role )
1248
1236
model .initial_data = initial_data
1249
- initial_data ["realm_allow_message_editing" ] = realm_editing_settings [
1237
+ initial_data ["realm_allow_message_editing" ] = realm_editing_settings . get (
1250
1238
"allow_message_editing"
1251
- ]
1239
+ )
1252
1240
allow_community_topic_editing = realm_editing_settings .get (
1253
1241
"allow_community_topic_editing" , None
1254
1242
)
0 commit comments