Merge branch 'master' into notify

Conflicts:
    test/Integration.cpp
This commit is contained in:
Alexey Sokolov
2015-11-30 08:02:47 +00:00
9 changed files with 149 additions and 37 deletions
+15
View File
@@ -1278,4 +1278,19 @@ TEST_F(ZNCTest, NotifyConnectModule) {
client.ReadUntil("NOTICE nick :*** user@identifier detached (from 127.0.0.1)");Z;
}
TEST_F(ZNCTest, WatchModule) {
// TODO test other messages
// TODO test options
auto znc = Run();Z;
auto ircd = ConnectIRCd();Z;
auto client = LoginClient();Z;
client.Write("znc loadmod watch");
client.Write("PRIVMSG *watch :add *");
client.ReadUntil("Adding entry:");
ircd.Write(":server 001 nick :Hello");
ircd.Write(":nick JOIN :#znc");
ircd.Write(":n!i@h PRIVMSG #znc :\001ACTION foo\001");
client.ReadUntil(":$*!watch@znc.in PRIVMSG nick :* CTCP: n [ACTION foo] to [#znc]");
}
} // namespace