test(output_modules): update button styles in message controls and search content tests

Author: Shadow243

tests/phpunit/bootstrap.php

@@ -20,12 +20,13 @@
 /* cache id */
 define('CACHE_ID', 'asdf');
 
-/* get mock objects */
-require APP_PATH.'tests/phpunit/mocks.php';
 
 /* get the framework */
 require APP_PATH.'lib/framework.php';
 
+/* get mock objects */
+require APP_PATH.'tests/phpunit/mocks.php';
+
 /* get the stubs */
 require APP_PATH.'tests/phpunit/stubs.php';
 

tests/phpunit/lib/ini_set.php

@@ -16,9 +16,7 @@ class Hm_Test_Ini_Set extends TestCase {
     private $originalIniValues = [];
 
     public function setUp(): void {
-        if (!defined('APP_PATH')) {
-            require_once __DIR__.'/../bootstrap.php';
-        }
+        require __DIR__.'/../bootstrap.php';
 
         $this->storeOriginalIniValues();
     }

tests/phpunit/lib/scram_authenticator.php

@@ -16,9 +16,7 @@ class Hm_Test_Scram_Authenticator extends TestCase {
     private $scram;
 
     public function setUp(): void {
-        if (!defined('APP_PATH')) {
-            require_once __DIR__.'/../bootstrap.php';
-        }
+        require __DIR__.'/../bootstrap.php';
 
         // Mock Hm_Debug if it doesn't exist
         if (!class_exists('Hm_Debug', false)) {

tests/phpunit/lib/searchable.php

@@ -13,16 +13,8 @@
 class Hm_Test_Searchable extends TestCase {
 
     public function setUp(): void {
-        if (!defined('APP_PATH')) {
-            require_once __DIR__.'/../bootstrap.php';
-        }
-        // Load mocks first
-        if (!class_exists('Hm_Mock_Session', false)) {
-            require_once APP_PATH.'tests/phpunit/mocks.php';
-        }
-
-        Mock_Searchable_Entity::resetTestData();
-        
+        require __DIR__.'/../bootstrap.php';
+        Mock_Searchable_Entity::resetTestData(); 
     }
 
     /**

tests/phpunit/mocks.php

@@ -190,34 +190,8 @@ public function __construct($type) {
     }
 }
 
-trait Mock_Searchable {
-    /**
-     * Return items matching $match in column $column.
-     *
-     * @param mixed  $match
-     * @param string $column
-     * @param bool   $returnFirst
-     * @return array|null
-     */
-    public static function getBy($match, $column = 'id', $returnFirst = false) {
-        $results = [];
-        foreach (static::getDataset() as $item) {
-            if (isset($item[$column]) && $item[$column] === $match) {
-                if ($returnFirst) {
-                    return $item;
-                }
-                $results[] = $item;
-            }
-        }
-        return $returnFirst ? null : $results;
-    }
-
-    // Each class must implement this
-    abstract protected static function getDataset();
-}
-
 class Mock_Searchable_Entity {
-    use Mock_Searchable;
+    use Searchable;
 
     private static $testData = [
         ['id' => 1, 'name' => 'John Doe', 'email' => '[email protected]', 'status' => 'active', 'age' => 30],
@@ -256,7 +230,7 @@ public static function setTestData(array $data) {
 }
 
 class Mock_Empty_Searchable_Entity {
-    use Mock_Searchable;
+    use Searchable;
 
     protected static function getDataset() {
         return [];
@@ -316,6 +290,7 @@ function error_resp($data) {
         return $pre." BAD Error in IMAP command received by server.\r\n";
     }
 }
+if (!class_exists('Hm_Functions')) {
 class Hm_Functions {
     public static $resource = false;
     public static $rand_bytes = 'good';
@@ -398,6 +373,7 @@ public static function stream_socket_enable_crypto($socket, $type) {
         return true;
     }
 }
+}
 function setup_db($config) {
     require_once __DIR__.'/bootstrap.php';
     $config->set('db_connection_type', env('DB_CONNECTION_TYPE', 'host'));

tests/phpunit/modules/core/message_list_functions.php

@@ -107,7 +107,7 @@ public function test_icon_callback() {
      */
     public function test_message_controls() {
         $mod = new Hm_Output_Test(array('msg_controls_extra' => 'foo', 'foo' => 'bar', 'bar' => 'foo'), array('bar'));
-        $this->assertEquals('<a class="toggle_link" href="#"><i class="bi bi-check-square-fill"></i></a><div class="msg_controls fs-6 d-none gap-1 align-items-center"><div class="dropdown on_mobile"><button type="button" class="btn btn-outline-success btn-sm dropdown-toggle" id="coreMsgControlDropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">Actions</button><ul class="dropdown-menu" aria-labelledby="coreMsgControlDropdown"><li><a class="dropdown-item msg_read core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="read">Read</a></li><li><a class="dropdown-item msg_unread core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="unread">Unread</a></li><li><a class="dropdown-item msg_flag core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="flag">Flag</a></li><li><a class="dropdown-item msg_unflag core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="unflag">Unflag</a></li><li><a class="dropdown-item msg_delete core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="delete">Delete</a></li><li><a class="dropdown-item msg_archive core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="archive">Archive</a></li><li><a class="dropdown-item msg_junk core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="junk">Junk</a></li></ul></div><a class="msg_read core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="read">Read</a><a class="msg_unread core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="unread">Unread</a><a class="msg_flag core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="flag">Flag</a><a class="msg_unflag core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="unflag">Unflag</a><a class="msg_delete core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="delete">Delete</a><a class="msg_archive core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="archive">Archive</a><a class="msg_junk core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="junk">Junk</a>foo</div>', message_controls($mod));
+        $this->assertEquals('<a class="toggle_link" href="#"><i class="bi bi-check-square-fill"></i></a><div class="msg_controls fs-6 d-none gap-1 align-items-center"><div class="dropdown on_mobile"><button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" id="coreMsgControlDropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">Actions</button><ul class="dropdown-menu" aria-labelledby="coreMsgControlDropdown"><li><a class="dropdown-item msg_read core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="read">Read</a></li><li><a class="dropdown-item msg_unread core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="unread">Unread</a></li><li><a class="dropdown-item msg_flag core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="flag">Flag</a></li><li><a class="dropdown-item msg_unflag core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="unflag">Unflag</a></li><li><a class="dropdown-item msg_delete core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="delete">Delete</a></li><li><a class="dropdown-item msg_archive core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="archive">Archive</a></li><li><a class="dropdown-item msg_junk core_msg_control btn btn-sm btn-light text-black-50" href="#" data-action="junk">Junk</a></li></ul></div><a class="msg_read core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="read">Read</a><a class="msg_unread core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="unread">Unread</a><a class="msg_flag core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="flag">Flag</a><a class="msg_unflag core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="unflag">Unflag</a><a class="msg_delete core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="delete">Delete</a><a class="msg_archive core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="archive">Archive</a><a class="msg_junk core_msg_control btn btn-sm btn-light no_mobile border text-black-50" href="#" data-action="junk">Junk</a>foo</div>', message_controls($mod));
     }
     /**
      * @preserveGlobalState disabled