Automatically record new Geomob events in personal data

This commit is contained in:
Edward Betts 2026-10-01 12:46:33 +01:00
parent 51b8bf6ecb
commit 22976868ce
3 changed files with 210 additions and 40 deletions

View file

@ -3,7 +3,8 @@
from datetime import date
from unittest.mock import Mock, mock_open, patch
import lxml.html
import flask
import lxml.html # type: ignore[import-untyped]
import pytest
from agenda.geomob import (
@ -16,7 +17,7 @@ from agenda.geomob import (
)
def test_geomob_event_dataclass():
def test_geomob_event_dataclass() -> None:
"""Test GeomobEvent dataclass creation and properties."""
event = GeomobEvent(
date=date(2024, 7, 15), href="/event/london-2024-07-15", hashtag="#geomobLDN"
@ -27,17 +28,17 @@ def test_geomob_event_dataclass():
assert event.hashtag == "#geomobLDN"
def test_geomob_event_frozen():
def test_geomob_event_frozen() -> None:
"""Test that GeomobEvent is frozen (immutable)."""
event = GeomobEvent(
date=date(2024, 7, 15), href="/event/london-2024-07-15", hashtag="#geomobLDN"
)
with pytest.raises(AttributeError):
event.date = date(2024, 8, 15)
event.date = date(2024, 8, 15) # type: ignore[misc]
def test_extract_events_with_valid_html():
def test_extract_events_with_valid_html() -> None:
"""Test extracting events from valid HTML."""
html_content = """
<html>
@ -64,7 +65,7 @@ def test_extract_events_with_valid_html():
assert events[1].hashtag == "#geomobBER"
def test_extract_events_empty_list():
def test_extract_events_empty_list() -> None:
"""Test extracting events from HTML with no events."""
html_content = """
<html>
@ -81,7 +82,7 @@ def test_extract_events_empty_list():
assert events == []
def test_extract_events_no_event_list():
def test_extract_events_no_event_list() -> None:
"""Test extracting events from HTML with no event list."""
html_content = """
<html>
@ -97,7 +98,7 @@ def test_extract_events_no_event_list():
assert events == []
def test_find_new_events_with_new_events():
def test_find_new_events_with_new_events() -> None:
"""Test finding new events when there are some."""
prev_events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
@ -118,7 +119,7 @@ def test_find_new_events_with_new_events():
assert new_events[0].hashtag == "#geomobPAR"
def test_find_new_events_no_new_events():
def test_find_new_events_no_new_events() -> None:
"""Test finding new events when there are none."""
events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
@ -129,7 +130,7 @@ def test_find_new_events_no_new_events():
assert new_events == []
def test_find_new_events_empty_previous():
def test_find_new_events_empty_previous() -> None:
"""Test finding new events when previous list is empty."""
cur_events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
@ -141,7 +142,7 @@ def test_find_new_events_empty_previous():
assert set(new_events) == set(cur_events)
def test_geomob_email_single_event():
def test_geomob_email_single_event() -> None:
"""Test generating email for a single new event."""
events = [GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")]
@ -156,7 +157,7 @@ def test_geomob_email_single_event():
assert "----------------------------------------" in body
def test_geomob_email_single_event_no_protocol():
def test_geomob_email_single_event_no_protocol() -> None:
"""Test generating email for a single new event with base URL without protocol."""
events = [GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")]
@ -171,7 +172,7 @@ def test_geomob_email_single_event_no_protocol():
assert "----------------------------------------" in body
def test_geomob_email_multiple_events():
def test_geomob_email_multiple_events() -> None:
"""Test generating email for multiple new events."""
events = [
GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN"),
@ -186,7 +187,7 @@ def test_geomob_email_multiple_events():
assert body.count("----------------------------------------") == 2
def test_geomob_email_no_double_slash():
def test_geomob_email_no_double_slash() -> None:
"""Test that URL construction doesn't create double slashes."""
events = [GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")]
@ -196,13 +197,13 @@ def test_geomob_email_no_double_slash():
assert "https://thegeomob.com/event/london-2024-07-15" in body
def test_geomob_email_empty_list():
def test_geomob_email_empty_list() -> None:
"""Test that geomob_email raises assertion error with empty list."""
with pytest.raises(AssertionError):
geomob_email([], "https://thegeomob.com")
def test_geomob_email_detects_double_slash_in_path():
def test_geomob_email_detects_double_slash_in_path() -> None:
"""Test that the function detects double slashes in the URL path."""
events = [GeomobEvent(date(2024, 7, 15), "//event/london-2024-07-15", "#geomobLDN")]
@ -213,7 +214,9 @@ def test_geomob_email_detects_double_slash_in_path():
@patch("agenda.utils.get_most_recent_file")
@patch("lxml.html.parse")
def test_get_cached_upcoming_events_list_with_file(mock_parse, mock_get_file):
def test_get_cached_upcoming_events_list_with_file(
mock_parse: Mock, mock_get_file: Mock
) -> None:
"""Test getting cached events when file exists."""
mock_get_file.return_value = "/path/to/recent.html"
@ -237,7 +240,7 @@ def test_get_cached_upcoming_events_list_with_file(mock_parse, mock_get_file):
@patch("agenda.utils.get_most_recent_file")
def test_get_cached_upcoming_events_list_no_file(mock_get_file):
def test_get_cached_upcoming_events_list_no_file(mock_get_file: Mock) -> None:
"""Test getting cached events when no file exists."""
mock_get_file.return_value = None
@ -254,16 +257,16 @@ def test_get_cached_upcoming_events_list_no_file(mock_get_file):
@patch("builtins.open", new_callable=mock_open)
@patch("agenda.geomob.datetime")
def test_update_with_new_events(
mock_datetime,
mock_open_file,
mock_join,
mock_get_cached,
mock_requests,
mock_send_mail,
):
mock_datetime: Mock,
mock_open_file: Mock,
mock_join: Mock,
mock_get_cached: Mock,
mock_requests: Mock,
mock_send_mail: Mock,
) -> None:
"""Test update function when there are new events."""
# Mock config
config = {"DATA_DIR": "/data"}
config = flask.config.Config("/", {"DATA_DIR": "/data"})
# Mock datetime
mock_now = Mock()
@ -293,7 +296,8 @@ def test_update_with_new_events(
]
mock_extract.return_value = cur_events
update(config)
with patch("agenda.geomob.record_event", return_value="Recorded and pushed."):
update(config)
# Verify file was written
mock_open_file.assert_called_once_with(
@ -309,9 +313,9 @@ def test_update_with_new_events(
@patch("requests.get")
@patch("agenda.geomob.get_cached_upcoming_events_list")
def test_update_no_changes(mock_get_cached, mock_requests):
def test_update_no_changes(mock_get_cached: Mock, mock_requests: Mock) -> None:
"""Test update function when there are no changes."""
config = {"DATA_DIR": "/data"}
config = flask.config.Config("/", {"DATA_DIR": "/data"})
# Mock identical events
events = [GeomobEvent(date(2024, 7, 15), "/event/london-2024-07-15", "#geomobLDN")]
@ -341,15 +345,15 @@ def test_update_no_changes(mock_get_cached, mock_requests):
@patch("builtins.open", new_callable=mock_open)
@patch("agenda.geomob.datetime")
def test_update_events_changed_but_no_new(
mock_datetime,
mock_open_file,
mock_join,
mock_get_cached,
mock_requests,
mock_send_mail,
):
mock_datetime: Mock,
mock_open_file: Mock,
mock_join: Mock,
mock_get_cached: Mock,
mock_requests: Mock,
mock_send_mail: Mock,
) -> None:
"""Test update function when events changed but no new ones added."""
config = {"DATA_DIR": "/data"}
config = flask.config.Config("/", {"DATA_DIR": "/data"})
# Mock datetime
mock_now = Mock()