aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Added cons message on ./bookmark add

Browse Source
This commit is contained in:
James Booth 2014-02-02 00:00:08 +00:00
parent af51fa3c68
commit ebafc19220
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/command/commands.c
View File

@ -1764,6 +1764,18 @@ cmd_bookmark(gchar **args, struct cmd_help_t help)
if (strcmp(cmd, "add") == 0) {
bookmark_add(jid, nick, autojoin);
GString *msg = g_string_new("Bookmark added for ");
g_string_append(msg, jid);
if (nick != NULL) {
g_string_append(msg, ", nickname: ");
g_string_append(msg, nick);
}
if (autojoin) {
g_string_append(msg, ", autojoin enabled");
}
g_string_append(msg, ".");
cons_show(msg->str);
g_string_free(msg, TRUE);
} else if (strcmp(cmd, "remove") == 0) {
bookmark_remove(jid, autojoin);
} else {

10
tests/test_cmd_bookmark.c
View File

@ -162,6 +162,7 @@ void cmd_bookmark_remove_shows_message_when_no_args_not_muc(void **state)
void cmd_bookmark_add_adds_bookmark_with_jid(void **state)
{
mock_bookmark_add();
mock_cons_show();
char *jid = "room@conf.server";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", jid, NULL };
@ -169,6 +170,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state)
mock_connection_status(JABBER_CONNECTED);
expect_bookmark_add(jid, NULL, FALSE);
expect_cons_show("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
@ -179,6 +181,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state)
void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state)
{
mock_bookmark_add();
mock_cons_show();
char *jid = "room@conf.server";
char *nick = "bob";
CommandHelp *help = malloc(sizeof(CommandHelp));
@ -187,6 +190,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state)
mock_connection_status(JABBER_CONNECTED);
expect_bookmark_add(jid, nick, FALSE);
expect_cons_show("Bookmark added for room@conf.server, nickname: bob.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
@ -197,6 +201,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state)
void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state)
{
mock_bookmark_add();
mock_cons_show();
char *jid = "room@conf.server";
char *nick = "bob";
CommandHelp *help = malloc(sizeof(CommandHelp));
@ -205,6 +210,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state)
mock_connection_status(JABBER_CONNECTED);
expect_bookmark_add(jid, nick, TRUE);
expect_cons_show("Bookmark added for room@conf.server, nickname: bob, autojoin enabled.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
@ -216,6 +222,7 @@ void cmd_bookmark_add_adds_bookmark_with_room_details(void **state)
{
mock_bookmark_add();
mock_ui_current_recipient();
mock_cons_show();
char *jid = "room@conf.server";
char *nick = "bob";
CommandHelp *help = malloc(sizeof(CommandHelp));
@ -229,6 +236,7 @@ void cmd_bookmark_add_adds_bookmark_with_room_details(void **state)
ui_current_recipient_returns(jid);
expect_bookmark_add(jid, nick, FALSE);
expect_cons_show("Bookmark added for room@conf.server, nickname: bob.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
@ -241,6 +249,7 @@ void cmd_bookmark_add_adds_bookmark_with_room_details_autojoin(void **state)
{
mock_bookmark_add();
mock_ui_current_recipient();
mock_cons_show();
char *jid = "room@conf.server";
char *nick = "bob";
CommandHelp *help = malloc(sizeof(CommandHelp));
@ -254,6 +263,7 @@ void cmd_bookmark_add_adds_bookmark_with_room_details_autojoin(void **state)
ui_current_recipient_returns(jid);
expect_bookmark_add(jid, nick, TRUE);
expect_cons_show("Bookmark added for room@conf.server, nickname: bob, autojoin enabled.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);