Merge branch 'dev'

Signed-off-by: salmonik <raisersoft@proton.me>

1 files changed, 55 insertions, 74 deletions

diff --git a/tests/cogs/test_cron.py b/tests/cogs/test_cron.py
index 93031f8..28ccfe1 100644
--- a/tests/cogs/test_cron.py
+++ b/tests/cogs/test_cron.py
@@ -1,10 +1,9 @@
-import json
-import os
 import pytest
 from datetime import datetime
 from unittest.mock import MagicMock, patch
 
 from cogs.cron import Cron
+from cogs.utils.database import _ConnectionContextManager
 
 
 @pytest.fixture
@@ -17,90 +16,74 @@ def mock_bot():
     return bot
 
 
-def create_cog(mock_bot, tmp_path):
+def create_cog(mock_bot):
     with patch.object(Cron, "__init__", lambda self, bot: None):
-        cog = Cron.__new__(Cron)
-        cog.bot = mock_bot
-        cog.scheduled_tasks = []
-        cog.cron_file = str(tmp_path / "cron_jobs.json")
-        cog.task = MagicMock()
-        return cog
+        with patch("cogs.cron.init_database"):
+            cog = Cron.__new__(Cron)
+            cog.bot = mock_bot
+            cog.scheduled_tasks = []
+            cog.task = MagicMock()
+            return cog
 
 
 class TestLoadTasks:
-    def test_load_tasks_file_not_exists(self, mock_bot, tmp_path):
-        cog = create_cog(mock_bot, tmp_path)
-        cog.cron_file = str(tmp_path / "nonexistent.json")
-        cog.load_tasks()
-        assert cog.scheduled_tasks == []
-
-    def test_load_tasks_empty_file(self, mock_bot, tmp_path):
-        cron_file = tmp_path / "empty.json"
-        cron_file.write_text("")
-        cog = create_cog(mock_bot, tmp_path)
-        cog.cron_file = str(cron_file)
-        cog.load_tasks()
-        assert cog.scheduled_tasks == []
-
-    def test_load_tasks_valid_file(self, mock_bot, tmp_path):
-        cron_file = tmp_path / "valid.json"
-        tasks = [{"id": 1, "cron_expression": "* * * * *", "type": "audio", "channel_id": 123, "active": True}]
-        cron_file.write_text(json.dumps(tasks))
-        cog = create_cog(mock_bot, tmp_path)
-        cog.cron_file = str(cron_file)
-        cog.load_tasks()
-        assert len(cog.scheduled_tasks) == 1
-        assert cog.scheduled_tasks[0]["id"] == 1
+    def test_load_tasks_with_data(self, mock_bot):
+        mock_conn = MagicMock()
+        mock_cursor = MagicMock()
+        mock_cursor.fetchall.return_value = [
+            (1, "* * * * *", "audio", 123, 1, None, "test message")
+        ]
+        mock_conn.cursor.return_value = mock_cursor
 
-    def test_load_tasks_io_error(self, mock_bot, tmp_path):
-        cog = create_cog(mock_bot, tmp_path)
-        with patch("builtins.open", side_effect=IOError("test error")):
-            cog.load_tasks()
-        assert cog.scheduled_tasks == []
+        # Create a context manager mock
+        mock_ctx = MagicMock()
+        mock_ctx.__enter__ = MagicMock(return_value=mock_conn)
+        mock_ctx.__exit__ = MagicMock(return_value=False)
 
+        with patch("cogs.cron.get_connection", return_value=mock_ctx):
+            cog = Cron.__new__(Cron)
+            cog.bot = mock_bot
+            cog.scheduled_tasks = []
+            cog.task = MagicMock()
+            cog.load_tasks()
+            assert len(cog.scheduled_tasks) == 1
+            assert cog.scheduled_tasks[0]["id"] == 1
 
 class TestSaveTasks:
-    def test_save_tasks_with_real_file(self, mock_bot, tmp_path):
-        cron_file = tmp_path / "cron_jobs.json"
-        cog = create_cog(mock_bot, tmp_path)
-        cog.cron_file = str(cron_file)
-        cog.scheduled_tasks = [{"id": 1, "cron_expression": "* * * * *"}]
-        cog.save_tasks()
-        assert os.path.exists(cron_file)
-        with open(cron_file) as f:
-            loaded = json.load(f)
-        assert len(loaded) == 1
+    def test_save_tasks(self, mock_bot):
+        cog = create_cog(mock_bot)
+        cog.scheduled_tasks = [{"id": 1, "cron_expression": "* * * * *", "type": "audio", "channel_id": 123, "active": True}]
 
-    def test_save_tasks_creates_directory_structure(self, mock_bot, tmp_path):
-        cog = create_cog(mock_bot, tmp_path)
-        new_dir = tmp_path / "new_dir"
-        cron_file = new_dir / "cron_jobs.json"
-        cog.cron_file = str(cron_file)
-        cog.scheduled_tasks = [{"id": 1}]
+        mock_conn = MagicMock()
+        mock_cursor = MagicMock()
+        mock_conn.cursor.return_value = mock_cursor
 
-        cog.save_tasks()
-
-        assert os.path.exists(new_dir)
+        # Create a context manager mock
+        mock_ctx = MagicMock()
+        mock_ctx.__enter__ = MagicMock(return_value=mock_conn)
+        mock_ctx.__exit__ = MagicMock(return_value=False)
 
+        with patch("cogs.cron.get_connection", return_value=mock_ctx):
+            cog.save_tasks()
+        assert len(cog.scheduled_tasks) == 1
 
 class TestShouldRunTask:
-    def test_should_run_task_invalid_cron(self, mock_bot, tmp_path):
-        cog = create_cog(mock_bot, tmp_path)
+    def test_should_run_task_invalid_cron(self, mock_bot):
+        cog = create_cog(mock_bot)
         task = {"cron_expression": "invalid"}
         now = datetime.now()
         result = cog.should_run_task(task, now)
         assert result is False
 
-    def test_should_run_task_missing_cron_expression(self, mock_bot, tmp_path):
-        cog = create_cog(mock_bot, tmp_path)
+    def test_should_run_task_missing_cron_expression(self, mock_bot):
+        cog = create_cog(mock_bot)
         task = {}
         now = datetime.now()
         result = cog.should_run_task(task, now)
         assert result is False
 
-
 class TestCogUnload:
-    def test_cog_unload_cancels_task(self, mock_bot, tmp_path):
+    def test_cog_unload_cancels_task(self, mock_bot):
         with patch.object(Cron, "__init__", lambda self, bot: None):
             cog = Cron.__new__(Cron)
             cog.bot = mock_bot
@@ -109,10 +92,9 @@ class TestCogUnload:
             cog.cog_unload()
             cog.task.cancel.assert_called_once()
 
-
 class TestTaskManagement:
-    def test_add_task_increments_id(self, mock_bot, tmp_path):
-        cog = create_cog(mock_bot, tmp_path)
+    def test_add_task_increments_id(self, mock_bot):
+        cog = create_cog(mock_bot)
         cog.scheduled_tasks = [
             {"id": 1, "cron_expression": "* * * * *"},
             {"id": 2, "cron_expression": "0 * * * *"},
@@ -121,8 +103,8 @@ class TestTaskManagement:
         new_id = max([t["id"] for t in cog.scheduled_tasks], default=0) + 1
         assert new_id == 3
 
-    def test_find_task_by_id(self, mock_bot, tmp_path):
-        cog = create_cog(mock_bot, tmp_path)
+    def test_find_task_by_id(self, mock_bot):
+        cog = create_cog(mock_bot)
         cog.scheduled_tasks = [
             {"id": 1, "cron_expression": "* * * * *"},
             {"id": 2, "cron_expression": "0 * * * *"},
@@ -132,8 +114,8 @@ class TestTaskManagement:
         assert found_task is not None
         assert found_task["cron_expression"] == "0 * * * *"
 
-    def test_remove_task_by_index(self, mock_bot, tmp_path):
-        cog = create_cog(mock_bot, tmp_path)
+    def test_remove_task_by_index(self, mock_bot):
+        cog = create_cog(mock_bot)
         cog.scheduled_tasks = [
             {"id": 1, "cron_expression": "* * * * *"},
             {"id": 2, "cron_expression": "0 * * * *"},
@@ -143,8 +125,8 @@ class TestTaskManagement:
         assert len(cog.scheduled_tasks) == 1
         assert cog.scheduled_tasks[0]["id"] == 2
 
-    def test_toggle_task_active(self, mock_bot, tmp_path):
-        cog = create_cog(mock_bot, tmp_path)
+    def test_toggle_task_active(self, mock_bot):
+        cog = create_cog(mock_bot)
         cog.scheduled_tasks = [{"id": 1, "active": True}]
 
         cog.scheduled_tasks[0]["active"] = False
@@ -153,14 +135,13 @@ class TestTaskManagement:
         cog.scheduled_tasks[0]["active"] = True
         assert cog.scheduled_tasks[0]["active"] is True
 
-
 class TestTaskTypes:
-    def test_task_type_audio_aliases(self, mock_bot, tmp_path):
+    def test_task_type_audio_aliases(self, mock_bot):
         audio_types = ("zagraj_audio", "audio")
         for task_type in audio_types:
             assert task_type in ("zagraj_audio", "audio")
 
-    def test_task_type_message_aliases(self, mock_bot, tmp_path):
+    def test_task_type_message_aliases(self, mock_bot):
         message_types = ("wyślij_wiadomość", "send_message")
         for task_type in message_types:
             assert task_type in ("wyślij_wiadomość", "send_message")