about summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test_cmd_bookmark.c4
-rw-r--r--tests/test_muc.c2
-rw-r--r--tests/test_server_events.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_cmd_bookmark.c b/tests/test_cmd_bookmark.c
index 4dc12217..e154413e 100644
--- a/tests/test_cmd_bookmark.c
+++ b/tests/test_cmd_bookmark.c
@@ -248,7 +248,7 @@ void cmd_bookmark_add_adds_bookmark_with_room_details(void **state)
     gchar *args[] = { "add", NULL };
 
     muc_init();
-    muc_join_room(jid, nick);
+    muc_join_room(jid, nick, NULL);
 
     mock_connection_status(JABBER_CONNECTED);
     mock_current_win_type(WIN_MUC);
@@ -275,7 +275,7 @@ void cmd_bookmark_add_adds_bookmark_with_room_details_autojoin(void **state)
     gchar *args[] = { "add", "autojoin", NULL };
 
     muc_init();
-    muc_join_room(jid, nick);
+    muc_join_room(jid, nick, NULL);
 
     mock_connection_status(JABBER_CONNECTED);
     mock_current_win_type(WIN_MUC);
diff --git a/tests/test_muc.c b/tests/test_muc.c
index 3cfb38b4..b1f55a53 100644
--- a/tests/test_muc.c
+++ b/tests/test_muc.c
@@ -70,7 +70,7 @@ void test_muc_room_is_active(void **state)
 {
     char *room = "room@server.org";
     char *nick = "bob";
-    muc_join_room(room, nick);
+    muc_join_room(room, nick, NULL);
 
     gboolean room_is_active = muc_room_is_active(room);
 
diff --git a/tests/test_server_events.c b/tests/test_server_events.c
index af8f8d1a..e660ae7e 100644
--- a/tests/test_server_events.c
+++ b/tests/test_server_events.c
@@ -192,7 +192,7 @@ void handle_presence_error_when_nick_conflict_shows_recipient_error(void **state
     char *type = NULL;
 
     muc_init();
-    muc_join_room(barejid, nick);
+    muc_join_room(barejid, nick, NULL);
 
     expect_ui_handle_recipient_error(barejid, err_msg);
 
@@ -212,7 +212,7 @@ void handle_presence_error_when_nick_conflict_does_not_join_room(void **state)
     stub_ui_handle_recipient_error();
 
     muc_init();
-    muc_join_room(barejid, nick);
+    muc_join_room(barejid, nick, NULL);
 
     handle_presence_error(from, type, err_msg);
 
26
27
28
29
30
31
32
33











                                                   



                                                            



                                                



                                                         

 
                                               
 
                                                        
 

                                        
 
#include <stdarg.h>
#include <stddef.h>
#include <setjmp.h>
#include <cmocka.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>

#include "config/preferences.h"

void statuses_console_defaults_to_all(void **state)
{
    char *setting = prefs_get_string(PREF_STATUSES_CONSOLE);

    assert_non_null(setting);
    assert_string_equal("all", setting);
}

void statuses_chat_defaults_to_all(void **state)
{
    char *setting = prefs_get_string(PREF_STATUSES_CHAT);

    assert_non_null(setting);
    assert_string_equal("all", setting);
}

void statuses_muc_defaults_to_all(void **state)
{
    char *setting = prefs_get_string(PREF_STATUSES_MUC);

    assert_non_null(setting);
    assert_string_equal("all", setting);
}