1 files changed, 8 insertions, 10 deletions
diff --git a/tests/test_cmd_connect.c b/tests/test_cmd_connect.c
index f4545fb2..0095d144 100644
--- a/tests/test_cmd_connect.c
+++ b/tests/test_cmd_connect.c
@@ -85,6 +85,7 @@ void cmd_connect_shows_message_when_undefined(void **state)
 void cmd_connect_when_no_account(void **state)
 {
     mock_cons_show();
+    mock_ui_ask_password();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "user@server.org", NULL };
 
@@ -93,7 +94,7 @@ void cmd_connect_when_no_account(void **state)
     expect_string(accounts_get_account, name, "user@server.org");
     will_return(accounts_get_account, NULL);
 
-    will_return(ui_ask_password, strdup("password"));
+    mock_ui_ask_password_returns("password");
 
     expect_cons_show("Connecting as user@server.org");
 
@@ -110,6 +111,7 @@ void cmd_connect_when_no_account(void **state)
 
 void cmd_connect_with_altdomain_when_provided(void **state)
 {
+    stub_ui_ask_password();
     stub_cons_show();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "user@server.org", "altdomain" };
@@ -119,8 +121,6 @@ void cmd_connect_with_altdomain_when_provided(void **state)
     expect_any(accounts_get_account, name);
     will_return(accounts_get_account, NULL);
 
-    will_return(ui_ask_password, strdup("password"));
-
     jabber_connect_with_details = _mock_jabber_connect_with_details_altdomain;
     expect_string(_mock_jabber_connect_with_details_altdomain, altdomain, "altdomain");
     will_return(_mock_jabber_connect_with_details_altdomain, JABBER_CONNECTING);
@@ -134,6 +134,8 @@ void cmd_connect_with_altdomain_when_provided(void **state)
 void cmd_connect_fail_message(void **state)
 {
     stub_cons_show();
+    mock_cons_show_error();
+    stub_ui_ask_password();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "user@server.org", NULL };
 
@@ -142,12 +144,10 @@ void cmd_connect_fail_message(void **state)
     expect_any(accounts_get_account, name);
     will_return(accounts_get_account, NULL);
 
-    will_return(ui_ask_password, strdup("password"));
-
     jabber_connect_with_details = _mock_jabber_connect_with_details_result;
     will_return(_mock_jabber_connect_with_details_result, JABBER_DISCONNECTED);
 
-    expect_string(cons_show_error, output, "Connection attempt for user@server.org failed.");
+    expect_cons_show_error("Connection attempt for user@server.org failed.");
 
     gboolean result = cmd_connect(args, *help);
     assert_true(result);
@@ -158,6 +158,7 @@ void cmd_connect_fail_message(void **state)
 void cmd_connect_lowercases_argument(void **state)
 {
     stub_cons_show();
+    stub_ui_ask_password();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "USER@server.ORG", NULL };
 
@@ -166,8 +167,6 @@ void cmd_connect_lowercases_argument(void **state)
     expect_string(accounts_get_account, name, "user@server.org");
     will_return(accounts_get_account, NULL);
 
-    will_return(ui_ask_password, strdup("password"));
-
     jabber_connect_with_details = _mock_jabber_connect_with_details_result;
     will_return(_mock_jabber_connect_with_details_result, JABBER_CONNECTING);
 
@@ -180,6 +179,7 @@ void cmd_connect_lowercases_argument(void **state)
 void cmd_connect_asks_password_when_not_in_account(void **state)
 {
     stub_cons_show();
+    stub_ui_ask_password();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "jabber_org", NULL };
     ProfAccount *account = malloc(sizeof(ProfAccount));
@@ -192,8 +192,6 @@ void cmd_connect_asks_password_when_not_in_account(void **state)
 
     will_return(accounts_create_full_jid, strdup("user@jabber.org"));
 
-    will_return(ui_ask_password, strdup("password"));
-
     jabber_connect_with_account = _mock_jabber_connect_with_account_result;
     will_return(_mock_jabber_connect_with_account_result, JABBER_CONNECTING);