add tests for journeys

3 files changed, 163 insertions, 10 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index 732c8d2..add3b3f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -60,26 +60,31 @@ def dbengine(app_settings, ini_file):
 def data_manager(app_settings):
     return DataManager(Path(app_settings["fietsboek.data_dir"]))
 
+
+def clean_directory_content(path: Path):
+    if path.is_dir():
+        shutil.rmtree(path)
+        path.mkdir()
+
+
 @pytest.fixture(autouse=True)
 def _cleanup_data(app_settings):
     yield
     engine = models.get_engine(app_settings)
-    db_meta = inspect(engine)
+    # Load all table names beforehand, as has_table() would cause lock conflicts
+    tables = inspect(engine).get_table_names()
     with engine.begin() as connection:
         for table in reversed(Base.metadata.sorted_tables):
             # The unit tests don't always set up the tables, so be gentle when
             # tearing them down
-            if db_meta.has_table(table.name):
+            if table.name in tables:
                 connection.execute(table.delete())
     # The unit tests also often don't have a data directory, so be gentle here as well
     if "fietsboek.data_dir" in app_settings:
         data_dir = Path(app_settings["fietsboek.data_dir"])
-        if (data_dir / "tracks").is_dir():
-            shutil.rmtree(data_dir / "tracks")
-            (data_dir / "tracks").mkdir()
-        if (data_dir / "users").is_dir():
-            shutil.rmtree(data_dir / "users")
-            (data_dir / "users").mkdir()
+        clean_directory_content(data_dir / "tracks")
+        clean_directory_content(data_dir / "users")
+        clean_directory_content(data_dir / "journeys")
 
 @pytest.fixture(scope='module')
 def app(app_settings, dbengine, tmp_path_factory):
diff --git a/tests/playwright/conftest.py b/tests/playwright/conftest.py
index adf5ef3..435daa6 100644
--- a/tests/playwright/conftest.py
+++ b/tests/playwright/conftest.py
@@ -110,7 +110,10 @@ class Helper:
             )
 
     def add_track(
-        self, user: Optional[models.User] = None, track_name: str = "Teasi_1.gpx.gz"
+        self,
+        user: Optional[models.User] = None,
+        track_name: str = "Teasi_1.gpx.gz",
+        title: str = "Another awesome track",
     ) -> models.Track:
         """Add a track to the given user.
 
@@ -127,7 +130,7 @@ class Helper:
                 TileRequester(None),
                 config.public_tile_layers()[0],
                 owner=user,
-                title="Another awesome track",
+                title=title,
                 visibility=Visibility.PRIVATE,
                 description="Another description",
                 track_type=TrackType.ORGANIC,
diff --git a/tests/playwright/test_journeys.py b/tests/playwright/test_journeys.py
new file mode 100644
index 0000000..f3fa0d2
--- /dev/null
+++ b/tests/playwright/test_journeys.py
@@ -0,0 +1,145 @@
+from playwright.sync_api import Page, expect
+from sqlalchemy import select
+
+from fietsboek import models
+
+
+def add_journey(playwright_helper, dbaccess, title):
+    """Adds a journey for testing purposes. Returns the journey ID."""
+    t_1 = playwright_helper.add_track(None, "Teasi_1.gpx.gz", "trayectoria uno")
+    t_2 = playwright_helper.add_track(None, "MyTourbook_1.gpx.gz", "trayectoria dos")
+
+    with dbaccess:
+        journey = models.Journey(
+            owner=playwright_helper.john_doe(),
+            title=title,
+            description="You saw sirens?",
+            visibility=models.journey.Visibility.PUBLIC,
+        )
+
+        dbaccess.add(journey)
+        dbaccess.flush()
+
+        journey.set_track_ids([t_1.id, t_2.id])
+        dbaccess.commit()
+        dbaccess.refresh(journey, ["id"])
+        dbaccess.expunge(journey)
+
+    playwright_helper.data_manager.initialize_journey(journey.id)
+
+    return journey.id
+
+
+def test_journey_list(page: Page, playwright_helper, dbaccess):
+    playwright_helper.login()
+
+    add_journey(playwright_helper, dbaccess, title="Our Journey")
+
+    page.goto("/journey/")
+    expect(page.locator("h5", has_text="Our Journey")).to_be_visible()
+    expect(page.locator("li", has_text="trayectoria uno")).to_be_visible()
+    expect(page.locator("li", has_text="trayectoria dos")).to_be_visible()
+
+
+def test_journey_new(page: Page, playwright_helper, dbaccess):
+    playwright_helper.login()
+
+    playwright_helper.add_track(None, "Teasi_1.gpx.gz", "trayectoria uno")
+    playwright_helper.add_track(None, "MyTourbook_1.gpx.gz", "trayectoria dos")
+    playwright_helper.add_track(None, "MyTourbook_1.gpx.gz", "trayectoria tres")
+
+    page.goto("/journey/")
+    page.get_by_text("New journey").click()
+
+    page.get_by_label("Title").fill("My Odyssey")
+    page.get_by_label("Description").fill("I saw sirens!")
+
+    page.locator("#trackSearch").fill("uno")
+    page.locator("#trackSearchButton").click()
+    page.locator(".track-query-response button").click()
+
+    page.locator("#trackSearch").fill("dos")
+    page.locator("#trackSearchButton").click()
+    page.locator(".track-query-response button").click()
+
+    page.locator("#trackSearch").fill("tres")
+    page.locator("#trackSearchButton").click()
+    page.locator(".track-query-response button").click()
+    page.locator(".journey-track", has_text="tres").locator(".btn").click()
+
+    page.locator(".btn", has_text="Save").click()
+
+    expect(page.locator("h1", has_text="My Odyssey")).to_be_visible()
+
+    expect(page.locator("h5", has_text="trayectoria uno")).to_be_visible()
+    expect(page.locator("h5", has_text="trayectoria dos")).to_be_visible()
+
+    journey = dbaccess.execute(select(models.Journey).filter_by(title="My Odyssey")).scalar_one()
+
+    assert journey.title == "My Odyssey"
+    assert journey.description == "I saw sirens!"
+    assert len(journey.tracks) == 2
+    assert journey.tracks[0].title == "trayectoria uno"
+    assert journey.tracks[1].title == "trayectoria dos"
+
+
+def test_journey_new_empty_title(page: Page, playwright_helper):
+    playwright_helper.login()
+
+    playwright_helper.add_track(None, "Teasi_1.gpx.gz", "trayectoria uno")
+
+    page.goto("/journey/")
+    page.get_by_text("New journey").click()
+
+    page.locator("#trackSearch").fill("uno")
+    page.locator("#trackSearchButton").click()
+    page.locator(".track-query-response button").click()
+    page.locator(".btn", has_text="Save").click()
+
+    expect(page.locator(".invalid-feedback", has_text="A title is required")).to_be_visible()
+
+
+def test_journey_new_no_tracks(page: Page, playwright_helper):
+    playwright_helper.login()
+
+    page.goto("/journey/")
+    page.get_by_text("New journey").click()
+
+    page.get_by_label("Title").fill("A title is there!")
+
+    page.locator(".btn", has_text="Save").click()
+
+    expect(page.locator(".invalid-feedback", has_text="A journey must have at least one track"))\
+        .to_be_visible()
+
+
+def test_journey_edit(page: Page, playwright_helper, dbaccess):
+    playwright_helper.login()
+
+    journey_id = add_journey(playwright_helper, dbaccess, title="Your Odyssey")
+
+    page.goto(f"/journey/{journey_id}/")
+
+    expect(page.locator("h1", has_text="Your Odyssey")).to_be_visible()
+
+    page.locator("a", has_text="Edit").click()
+
+    page.get_by_label("Title").fill("Their Odyssey")
+    page.get_by_label("Description").fill("Where is Homer?")
+
+    expect(page.locator(".track-title", has_text="trayectoria uno")).to_be_visible()
+    page.locator(".journey-track", has_text="uno").locator(".btn").click()
+    expect(page.locator(".track-title", has_text="trayectoria uno")).not_to_be_visible()
+
+    page.locator(".btn", has_text="Save").click()
+
+    expect(page.locator("h1", has_text="Their Odyssey")).to_be_visible()
+    expect(page.locator("h5", has_text="trayectoria uno")).not_to_be_visible()
+    expect(page.locator("h5", has_text="trayectoria dos")).to_be_visible()
+
+    journey = dbaccess.execute(select(models.Journey).filter_by(title="Their Odyssey")).scalar_one()
+
+    assert journey.title == "Their Odyssey"
+    assert journey.description == "Where is Homer?"
+    assert len(journey.tracks) == 1
+    assert journey.tracks[0].title == "trayectoria dos"