Fix unit tests

Author: josaphatim

lib/dispatch.php

@@ -54,7 +54,7 @@ private function redirect_to_url($mod_exec) {
      * @return void
      */
     private function forward_messages($session, $request) {
-        $msgs = Hm_Msgs::get();
+        $msgs = Hm_Msgs::getRaw();
         if (!empty($msgs)) {
             $session->secure_cookie($request, 'hm_msgs', base64_encode(json_encode($msgs)));
         }

lib/format.php

@@ -45,7 +45,7 @@ class Hm_Format_JSON extends HM_Format {
      * @return string encoded data to be sent to the browser
      */
     public function content($output, $allowed_output) {
-        $output['router_user_msgs'] = Hm_Msgs::get();
+        $output['router_user_msgs'] = Hm_Msgs::getRaw();
         $output = $this->filter_all_output($output, $allowed_output);
         if ($this->config->get('encrypt_ajax_requests', false)) {
             $output = ['payload' => Hm_Crypt_Base::ciphertext(json_encode($output, JSON_FORCE_OBJECT), Hm_Request_Key::generate())];

lib/module.php

@@ -439,7 +439,7 @@ public function module_is_supported($name) {
     }
 
     public function save_hm_msgs() {
-        $msgs = Hm_Msgs::get();
+        $msgs = Hm_Msgs::getRaw();
         if (!empty($msgs)) {
             Hm_Msgs::flush();
             $this->session->secure_cookie($this->request, 'hm_msgs', base64_encode(json_encode($msgs)));

lib/output.php

@@ -81,7 +81,7 @@ public static function add($string, $type = 'success') {
      * Return all messages
      * @return array all messages
      */
-    public static function get() {
+    public static function getRaw() {
         return self::$msgs;
     }
 
@@ -110,6 +110,12 @@ public static function str($mixed, $return_type = true) {
         return $str;
     }
 
+    public static function get() {
+        return array_map(function ($msg) {
+            return $msg['text'];
+        }, self::$msgs);
+    }
+
     /**
      * Log all messages
      * @return bool
@@ -132,25 +138,27 @@ class Hm_Msgs { use Hm_List; }
  */
 class Hm_Debug {
 
-    use Hm_List;
+    use Hm_List {
+        add as protected self_add;
+    }
 
     /**
      * @override
      */
     public static function add($string, $type = 'danger') {
-        Hm_List::add($string, $type);
+        self::self_add($string, $type);
     }
 
     /**
      * Add page execution stats to the Hm_Debug list
      * @return void
      */
     public static function load_page_stats() {
-        self::add(sprintf("PHP version %s", phpversion()));
-        self::add(sprintf("Zend version %s", zend_version()));
-        self::add(sprintf("Peak Memory: %d", (memory_get_peak_usage(true)/1024)));
-        self::add(sprintf("PID: %d", getmypid()));
-        self::add(sprintf("Included files: %d", count(get_included_files())));
+        self::add(sprintf("PHP version %s", phpversion()), 'info');
+        self::add(sprintf("Zend version %s", zend_version()), 'info');
+        self::add(sprintf("Peak Memory: %d", (memory_get_peak_usage(true)/1024)), 'info');
+        self::add(sprintf("PID: %d", getmypid()), 'info');
+        self::add(sprintf("Included files: %d", count(get_included_files())), 'info');
     }
 }
 

modules/core/output_modules.php

@@ -355,7 +355,7 @@ class Hm_Output_msgs extends Hm_Output_Module {
      */
     protected function output() {
         $res = '';
-        $msgs = Hm_Msgs::get();
+        $msgs = Hm_Msgs::getRaw();
         $logged_out_class = '';
         if (!$this->get('router_login_state') && !empty($msgs)) {
             $logged_out_class = ' logged_out';

tests/phpunit/.phpunit.cache/test-results

@@ -0,0 +1 @@
+{"version":1,"defects":{"Hm_Test_Core_Output_Modules::test_msgs":7,"Hm_Test_Core_Functions::test_save_user_settings":7,"Hm_Test_Core_Handler_Modules::test_save_user_settings":8,"Hm_Test_Core_Handler_Modules::test_process_pw_update":7,"Hm_Test_Core_Handler_Modules::test_process_save_form":7,"Hm_Test_Core_Handler_Modules::test_logout":7},"times":{"Hm_Test_Msgs::test_add":0.004,"Hm_Test_Msgs::test_flush":0.001,"Hm_Test_Msgs::test_get":0.001,"Hm_Test_Msgs::test_str":0.001,"Hm_Test_Msgs::test_show":0.001,"Hm_Test_Msgs::test_elog":0.002,"Hm_Test_Core_Output_Modules::test_msgs":0.013,"Hm_Test_Core_Functions::test_save_user_settings":0.001,"Hm_Test_Core_Handler_Modules::test_save_user_settings":0.001,"Hm_Test_Core_Functions::test_interface_langs":0.003,"Hm_Test_Core_Functions::test_display_value":0.003,"Hm_Test_Core_Functions::test_translate_time_str":0.001,"Hm_Test_Core_Functions::test_format_data_sources":0.002,"Hm_Test_Core_Functions::test_email_is_active":0.002,"Hm_Test_Core_Functions::test_is_email_address":0.001,"Hm_Test_Core_Functions::test_get_oauth2_data":0.001,"Hm_Test_Core_Functions::test_process_site_setting":0.001,"Hm_Test_Core_Functions::test_process_since_argument":0.001,"Hm_Test_Core_Functions::test_since_setting_callback":0.001,"Hm_Test_Core_Functions::test_max_source_setting_callback":0.001,"Hm_Test_Core_Functions::test_setup_base_ajax_page":0.001,"Hm_Test_Core_Functions::test_setup_base_page":0.001,"Hm_Test_Core_Functions::test_start_page_opts":0.001,"Hm_Test_Core_Functions::test_get_tls_stream_type":0.001,"Hm_Test_Core_Functions::test_merge_folder_list_details":0.002,"Hm_Test_Core_Functions::test_in_server_list":0.001,"Hm_Test_Core_Functions::test_profiles_by_server_id":0.002,"Hm_Test_Core_Handler_Modules::test_check_folder_icon_setting":0.003,"Hm_Test_Core_Handler_Modules::test_process_pw_update":0.001,"Hm_Test_Core_Handler_Modules::test_check_missing_passwords":0.004,"Hm_Test_Core_Handler_Modules::test_close_session_early":0.001,"Hm_Test_Core_Handler_Modules::test_http_headers":0.001,"Hm_Test_Core_Handler_Modules::test_http_headers_allow_images":0.001,"Hm_Test_Core_Handler_Modules::test_process_list_style_setting_passed":0.001,"Hm_Test_Core_Handler_Modules::test_process_list_style_setting_failed":0.001,"Hm_Test_Core_Handler_Modules::test_process_start_page_setting_passed":0.001,"Hm_Test_Core_Handler_Modules::test_process_start_page_setting_failed":0.001,"Hm_Test_Core_Handler_Modules::test_process_hide_folder_icons_setting_failed":0.001,"Hm_Test_Core_Handler_Modules::test_process_mailto_handler":0.001,"Hm_Test_Core_Handler_Modules::test_process_show_list_icons":0.001,"Hm_Test_Core_Handler_Modules::test_process_unread_source_max_setting":0.001,"Hm_Test_Core_Handler_Modules::test_process_all_email_source_max_setting":0.001,"Hm_Test_Core_Handler_Modules::test_process_no_password_setting":0.001,"Hm_Test_Core_Handler_Modules::test_process_delete_prompt_setting":0.001,"Hm_Test_Core_Handler_Modules::test_process_all_source_max_setting":0.001,"Hm_Test_Core_Handler_Modules::test_process_flagged_source_max_setting":0.001,"Hm_Test_Core_Handler_Modules::test_process_flagged_since_setting":0.001,"Hm_Test_Core_Handler_Modules::test_process_all_since_setting":0.001,"Hm_Test_Core_Handler_Modules::test_process_all_email_since_setting":0.001,"Hm_Test_Core_Handler_Modules::test_process_unread_since_setting":0.001,"Hm_Test_Core_Handler_Modules::test_process_language_setting_passed":0.001,"Hm_Test_Core_Handler_Modules::test_process_language_setting_failed":0.002,"Hm_Test_Core_Handler_Modules::test_process_timezone_setting_passed":0.001,"Hm_Test_Core_Handler_Modules::test_process_timezone_setting_failed":0.001,"Hm_Test_Core_Handler_Modules::test_process_save_form":0.001,"Hm_Test_Core_Handler_Modules::test_title":0.001,"Hm_Test_Core_Handler_Modules::test_language":0.001,"Hm_Test_Core_Handler_Modules::test_date":0.001,"Hm_Test_Core_Handler_Modules::test_stay_logged_in":0.001,"Hm_Test_Core_Handler_Modules::test_login":0.003,"Hm_Test_Core_Handler_Modules::test_default_page_data":0.001,"Hm_Test_Core_Handler_Modules::test_load_user_data":0.001,"Hm_Test_Core_Handler_Modules::test_save_user_data":0.001,"Hm_Test_Core_Handler_Modules::test_logout":0.001,"Hm_Test_Core_Handler_Modules::test_message_list_type":0.001,"Hm_Test_Core_Handler_Modules::test_reload_folder_cookie":0.001,"Hm_Test_Core_Handler_Modules::test_reset_search":0.001,"Hm_Test_Core_Handler_Modules::test_process_search_terms":0.001}}

tests/phpunit/modules/core/functions.php

@@ -145,7 +145,7 @@ public function test_save_user_settings() {
         $handler_mod->session->auth_state = false;
         save_user_settings($handler_mod, array('password' => 'foo'), false);
         $msgs = Hm_Msgs::get();
-        $this->assertEquals('ERRIncorrect password, could not save settings to the server', $msgs[3]);
+        $this->assertEquals('Incorrect password, could not save settings to the server', $msgs[3]);
 
     }
     /**

tests/phpunit/modules/core/handler_modules.php

@@ -35,7 +35,7 @@ public function test_process_pw_update() {
 
         $test->input = array('missing_pw_servers' => array('a1' => array('id' => 'a1', 'type' => 'SMTP')));
         $res = $test->run();
-        $this->assertEquals(array('ERRUnable to authenticate to the SMTP server'), Hm_Msgs::get());
+        $this->assertEquals(array('Unable to authenticate to the SMTP server'), Hm_Msgs::get());
         $this->assertFalse($res->handler_response['connect_status']);
         Hm_Msgs::flush();
 
@@ -49,7 +49,7 @@ public function test_process_pw_update() {
 
         $test->input = array('missing_pw_servers' => array('a1' => array('id' => 'a1', 'type' => 'IMAP')));
         $res = $test->run();
-        $this->assertEquals(array('ERRUnable to authenticate to the IMAP server'), Hm_Msgs::get());
+        $this->assertEquals(array('Unable to authenticate to the IMAP server'), Hm_Msgs::get());
         $this->assertFalse($res->handler_response['connect_status']);
         Hm_Msgs::flush();
 
@@ -482,7 +482,7 @@ public function test_logout() {
         $test->prep();
         $test->ses_obj->auth_state = false;
         $test->run_only();
-        $this->assertEquals(array('ERRIncorrect password, could not save settings to the server'), Hm_Msgs::get());
+        $this->assertEquals(array('Incorrect password, could not save settings to the server'), Hm_Msgs::get());
         Hm_Msgs::flush();
         $test->prep();
         $test->ses_obj->auth_state = true;
@@ -492,7 +492,7 @@ public function test_logout() {
 
         $test->post = array('save_and_logout' => true);
         $test->run();
-        $this->assertEquals(array('ERRYour password is required to save your settings to the server'), Hm_Msgs::get());
+        $this->assertEquals(array('Your password is required to save your settings to the server'), Hm_Msgs::get());
         Hm_Msgs::flush();
     }
     /**

tests/phpunit/modules/core/output_modules.php

@@ -322,18 +322,6 @@ public function test_date() {
         $res = $test->run();
         $this->assertEquals(array('<div class="date"></div>'), $res->output_response);
     }
-    /**
-     * @preserveGlobalState disabled
-     * @runInSeparateProcess
-     */
-    public function test_msgs() {
-        Hm_Msgs::add('foo', 'danger');
-        Hm_Msgs::add('foo');
-        $test = new Output_Test('msgs', 'core');
-        $test->handler_response = array('router_login_state' => false);
-        $res = $test->run();
-        $this->assertEquals(array('<div class="d-none position-fixed top-0 end-0 mt-3 me-3 sys_messages logged_out"><div class="alert alert-danger alert-dismissible fade show" role="alert"><i class="bi bi-exclamation-triangle me-2"></i><span class="danger">foo</span><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><div class="alert alert-success alert-dismissible fade show" role="alert"><i class="bi bi-check-circle me-2"></i><span class="info">foo</span><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div></div>'), $res->output_response);
-    }
     /**
      * @preserveGlobalState disabled
      * @runInSeparateProcess

tests/phpunit/msgs.php

@@ -56,7 +56,7 @@ public function test_str() {
      */
     public function test_show() {
         Hm_Msgs::add('msg');
-        $this->assertEquals("Array\n(\n    [0] => msg\n)\n", Hm_Msgs::show());
+        $this->assertEquals("Array\n(\n    [0] => SUCCESS: msg\n)\n", Hm_Msgs::show());
     }
     /**
      * @preserveGlobalState disabled