Skip to content
Snippets Groups Projects
Commit a54d7343 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

fix trivial bug in unimplemented knock push rule

parent f867c880
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,7 @@ stringToJoinRule(const std::string &rule) ...@@ -33,7 +33,7 @@ stringToJoinRule(const std::string &rule)
return JoinRule::Public; return JoinRule::Public;
else if (rule == "invite") else if (rule == "invite")
return JoinRule::Invite; return JoinRule::Invite;
else if (rule == "Knock") else if (rule == "knock")
return JoinRule::Knock; return JoinRule::Knock;
return JoinRule::Private; return JoinRule::Private;
......
...@@ -332,6 +332,54 @@ TEST(StateEvents, JoinRules) ...@@ -332,6 +332,54 @@ TEST(StateEvents, JoinRules)
EXPECT_EQ(event.content.join_rule, ns::state::JoinRule::Invite); EXPECT_EQ(event.content.join_rule, ns::state::JoinRule::Invite);
EXPECT_EQ(data, json(event)); EXPECT_EQ(data, json(event));
data = R"({
"origin_server_ts": 1506761924018,
"sender": "@mujx:matrix.org",
"event_id": "$15067619241414401ASocy:matrix.org",
"unsigned": {
"age": 3715756273
},
"state_key": "",
"content": {
"join_rule": "public"
},
"type": "m.room.join_rules"
})"_json;
EXPECT_EQ(data, json(ns::StateEvent<ns::state::JoinRules>(data)));
data = R"({
"origin_server_ts": 1506761924018,
"sender": "@mujx:matrix.org",
"event_id": "$15067619241414401ASocy:matrix.org",
"unsigned": {
"age": 3715756273
},
"state_key": "",
"content": {
"join_rule": "knock"
},
"type": "m.room.join_rules"
})"_json;
EXPECT_EQ(data, json(ns::StateEvent<ns::state::JoinRules>(data)));
data = R"({
"origin_server_ts": 1506761924018,
"sender": "@mujx:matrix.org",
"event_id": "$15067619241414401ASocy:matrix.org",
"unsigned": {
"age": 3715756273
},
"state_key": "",
"content": {
"join_rule": "private"
},
"type": "m.room.join_rules"
})"_json;
EXPECT_EQ(data, json(ns::StateEvent<ns::state::JoinRules>(data)));
} }
TEST(StateEvents, Member) TEST(StateEvents, Member)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment