Tighten configuration and export handling

tests/test_client.py

@@ -1,22 +1,28 @@
+import os
 from unittest import mock
+
 from redmine_reporter.client import fetch_issues_with_spent_time
-from redmine_reporter.config import Config
+from redmine_reporter.config import DEFAULT_REDMINE_VERIFY
+
+PASSWORD_ENV = {
+    "REDMINE_URL": "https://red.eltex.loc",
+    "REDMINE_USER": "user",
+    "REDMINE_PASSWORD": "password",
+}
 
 
-@mock.patch.multiple(
-    Config,
-    REDMINE_URL="https://red.eltex.loc",
-    REDMINE_API_KEY=None,
-    REDMINE_USER="user",
-    REDMINE_PASSWORD="password",
-)
+def _configure_current_user(mock_redmine, user_id=1):
+    mock_user = mock.MagicMock()
+    mock_user.id = user_id
+    mock_redmine.user.get.return_value = mock_user
+
+
+@mock.patch.dict(os.environ, PASSWORD_ENV, clear=True)
 @mock.patch("redmine_reporter.client.Redmine")
 def test_fetch_aggregates_hours_per_issue(mock_redmine_class):
     """Два time entry на одну задачу -- часы суммируются."""
     mock_redmine = mock_redmine_class.return_value
-    mock_user = mock.MagicMock()
-    mock_user.id = 123
-    mock_redmine.user.get.return_value = mock_user
+    _configure_current_user(mock_redmine, user_id=123)
 
     mock_entry1 = mock.MagicMock()
     mock_entry1.issue.id = 101
@@ -41,40 +47,24 @@ def test_fetch_aggregates_hours_per_issue(mock_redmine_class):
     assert total_hours == 3.5
 
 
-@mock.patch.multiple(
-    Config,
-    REDMINE_URL="https://red.eltex.loc",
-    REDMINE_API_KEY=None,
-    REDMINE_USER="user",
-    REDMINE_PASSWORD="password",
-)
+@mock.patch.dict(os.environ, PASSWORD_ENV, clear=True)
 @mock.patch("redmine_reporter.client.Redmine")
 def test_fetch_returns_none_when_no_entries(mock_redmine_class):
     """Нет time entries -- возвращается None."""
     mock_redmine = mock_redmine_class.return_value
-    mock_user = mock.MagicMock()
-    mock_user.id = 1
-    mock_redmine.user.get.return_value = mock_user
+    _configure_current_user(mock_redmine)
     mock_redmine.time_entry.filter.return_value = []
 
     result = fetch_issues_with_spent_time("2026-01-01", "2026-01-31")
     assert result is None
 
 
-@mock.patch.multiple(
-    Config,
-    REDMINE_URL="https://red.eltex.loc",
-    REDMINE_API_KEY=None,
-    REDMINE_USER="user",
-    REDMINE_PASSWORD="password",
-)
+@mock.patch.dict(os.environ, PASSWORD_ENV, clear=True)
 @mock.patch("redmine_reporter.client.Redmine")
 def test_fetch_skips_entries_without_issue(mock_redmine_class):
     """Time entry без привязки к задаче игнорируется."""
     mock_redmine = mock_redmine_class.return_value
-    mock_user = mock.MagicMock()
-    mock_user.id = 1
-    mock_redmine.user.get.return_value = mock_user
+    _configure_current_user(mock_redmine)
 
     # entry без issue атрибута
     entry_no_issue = mock.MagicMock(spec=["hours"])  # нет .issue
@@ -86,20 +76,12 @@ def test_fetch_skips_entries_without_issue(mock_redmine_class):
     assert result is None
 
 
-@mock.patch.multiple(
-    Config,
-    REDMINE_URL="https://red.eltex.loc",
-    REDMINE_API_KEY=None,
-    REDMINE_USER="user",
-    REDMINE_PASSWORD="password",
-)
+@mock.patch.dict(os.environ, PASSWORD_ENV, clear=True)
 @mock.patch("redmine_reporter.client.Redmine")
 def test_fetch_multiple_issues(mock_redmine_class):
     """Несколько задач -- каждая с правильным суммарным временем."""
     mock_redmine = mock_redmine_class.return_value
-    mock_user = mock.MagicMock()
-    mock_user.id = 1
-    mock_redmine.user.get.return_value = mock_user
+    _configure_current_user(mock_redmine)
 
     def make_entry(issue_id, hours):
         e = mock.MagicMock()
@@ -130,44 +112,38 @@ def test_fetch_multiple_issues(mock_redmine_class):
     assert hours_by_id[2] == 2.0
 
 
-@mock.patch.multiple(
-    Config,
-    REDMINE_URL="https://red.eltex.loc",
-    REDMINE_API_KEY="api-token",
-    REDMINE_USER="user",
-    REDMINE_PASSWORD="password",
+@mock.patch.dict(
+    os.environ,
+    {
+        "REDMINE_URL": "https://red.eltex.loc",
+        "REDMINE_API_KEY": "api-token",
+        "REDMINE_USER": "user",
+        "REDMINE_PASSWORD": "password",
+    },
+    clear=True,
 )
 @mock.patch("redmine_reporter.client.Redmine")
 def test_fetch_uses_api_key_when_present(mock_redmine_class):
     """Если задан API key, он используется вместо логина/пароля."""
     mock_redmine = mock_redmine_class.return_value
-    mock_user = mock.MagicMock()
-    mock_user.id = 1
-    mock_redmine.user.get.return_value = mock_user
+    _configure_current_user(mock_redmine)
     mock_redmine.time_entry.filter.return_value = []
 
     fetch_issues_with_spent_time("2026-01-01", "2026-01-31")
 
     _, kwargs = mock_redmine_class.call_args
     assert kwargs["key"] == "api-token"
+    assert kwargs["requests"] == {"verify": DEFAULT_REDMINE_VERIFY}
     assert "username" not in kwargs
     assert "password" not in kwargs
 
 
-@mock.patch.multiple(
-    Config,
-    REDMINE_URL="https://red.eltex.loc",
-    REDMINE_API_KEY=None,
-    REDMINE_USER="user",
-    REDMINE_PASSWORD="password",
-)
+@mock.patch.dict(os.environ, PASSWORD_ENV, clear=True)
 @mock.patch("redmine_reporter.client.Redmine")
 def test_fetch_uses_username_password_when_no_api_key(mock_redmine_class):
     """Если API key не задан, остаётся старая схема логин/пароль."""
     mock_redmine = mock_redmine_class.return_value
-    mock_user = mock.MagicMock()
-    mock_user.id = 1
-    mock_redmine.user.get.return_value = mock_user
+    _configure_current_user(mock_redmine)
     mock_redmine.time_entry.filter.return_value = []
 
     fetch_issues_with_spent_time("2026-01-01", "2026-01-31")
@@ -175,4 +151,18 @@ def test_fetch_uses_username_password_when_no_api_key(mock_redmine_class):
     _, kwargs = mock_redmine_class.call_args
     assert kwargs["username"] == "user"
     assert kwargs["password"] == "password"
+    assert kwargs["requests"] == {"verify": DEFAULT_REDMINE_VERIFY}
     assert "key" not in kwargs
+
+
+@mock.patch.dict(os.environ, {**PASSWORD_ENV, "REDMINE_VERIFY": "/tmp/redmine-ca.pem"}, clear=True)
+@mock.patch("redmine_reporter.client.Redmine")
+def test_fetch_uses_custom_verify_path(mock_redmine_class):
+    mock_redmine = mock_redmine_class.return_value
+    _configure_current_user(mock_redmine)
+    mock_redmine.time_entry.filter.return_value = []
+
+    fetch_issues_with_spent_time("2026-01-01", "2026-01-31")
+
+    _, kwargs = mock_redmine_class.call_args
+    assert kwargs["requests"] == {"verify": "/tmp/redmine-ca.pem"}