mirror of
https://github.com/profanity-im/profanity.git
synced 2024-12-04 14:46:46 -05:00
Merge branch 'master' into osx-functional
This commit is contained in:
commit
c963ac3bb2
@ -61,7 +61,8 @@ int main(int argc, char* argv[]) {
|
|||||||
PROF_FUNC_TEST(presence_missing_resource_defaults),
|
PROF_FUNC_TEST(presence_missing_resource_defaults),
|
||||||
|
|
||||||
PROF_FUNC_TEST(message_send),
|
PROF_FUNC_TEST(message_send),
|
||||||
PROF_FUNC_TEST(message_receive),
|
PROF_FUNC_TEST(message_receive_console),
|
||||||
|
PROF_FUNC_TEST(message_receive_chatwin),
|
||||||
|
|
||||||
PROF_FUNC_TEST(sends_message_to_barejid_when_contact_offline),
|
PROF_FUNC_TEST(sends_message_to_barejid_when_contact_offline),
|
||||||
PROF_FUNC_TEST(sends_message_to_barejid_when_contact_online),
|
PROF_FUNC_TEST(sends_message_to_barejid_when_contact_online),
|
||||||
|
@ -28,7 +28,7 @@ message_send(void **state)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
message_receive(void **state)
|
message_receive_console(void **state)
|
||||||
{
|
{
|
||||||
prof_connect();
|
prof_connect();
|
||||||
|
|
||||||
@ -40,3 +40,20 @@ message_receive(void **state)
|
|||||||
|
|
||||||
assert_true(prof_output_exact("<< chat message: someuser@chatserv.org/laptop (win 2)"));
|
assert_true(prof_output_exact("<< chat message: someuser@chatserv.org/laptop (win 2)"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
message_receive_chatwin(void **state)
|
||||||
|
{
|
||||||
|
prof_connect();
|
||||||
|
|
||||||
|
prof_input("/msg someuser@chatserv.org");
|
||||||
|
prof_output_exact("someuser@chatserv.org");
|
||||||
|
|
||||||
|
stbbr_send(
|
||||||
|
"<message id=\"message1\" to=\"stabber@localhost\" from=\"someuser@chatserv.org/laptop\" type=\"chat\">"
|
||||||
|
"<body>How are you?</body>"
|
||||||
|
"</message>"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_true(prof_output_regex("someuser@chatserv.org/laptop: .+How are you?"));
|
||||||
|
}
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
void message_send(void **state);
|
void message_send(void **state);
|
||||||
void message_receive(void **state);
|
void message_receive_console(void **state);
|
||||||
|
void message_receive_chatwin(void **state);
|
||||||
|
Loading…
Reference in New Issue
Block a user