adding latest

tests/test_journal/test_pages.py

@@ -5,6 +5,7 @@ import pytest
 
 from tembo import PageCreatorOptions, ScopedPageCreator
 from tembo import exceptions
+from tembo.utils import Success
 
 
 DATE_TODAY = date.today().strftime("%d-%m-%Y")
@@ -90,7 +91,7 @@ def test_create_page_already_exists(datadir):
     # act
     scoped_page = ScopedPageCreator(options).create_page()
     with pytest.raises(exceptions.ScopedPageAlreadyExists) as page_already_exists:
-        scoped_page.save_to_disk()
+        result = scoped_page.save_to_disk()
 
     # assert
     assert scoped_page_file.exists()
@@ -99,7 +100,7 @@ def test_create_page_already_exists(datadir):
         assert scoped_page_contents.readlines() == ["this file already exists\n"]
 
 
-def test_create_page_without_template(tmpdir, caplog):
+def test_create_page_without_template(tmpdir):
     # arrange
     options = PageCreatorOptions(
         base_path=str(tmpdir),
@@ -112,18 +113,18 @@ def test_create_page_without_template(tmpdir, caplog):
         template_filename=None,
         template_path=None,
     )
-    # TODO: copy this pattern creation into the other tests
     scoped_page_file = (
         pathlib.Path(options.base_path) / options.page_path / options.filename
     ).with_suffix(f".{options.extension}")
 
     # act
     scoped_page = ScopedPageCreator(options).create_page()
-    scoped_page.save_to_disk()
+    result = scoped_page.save_to_disk()
 
     # assert
     assert scoped_page_file.exists()
-    assert caplog.records[0].message == f"Saved {scoped_page_file} to disk"
+    assert isinstance(result, Success)
+    assert result.message == str(scoped_page_file)
     with scoped_page_file.open("r", encoding="utf-8") as scoped_page_contents:
         assert scoped_page_contents.readlines() == []
 
@@ -147,11 +148,12 @@ def test_create_page_with_template(datadir, caplog):
 
     # act
     scoped_page = ScopedPageCreator(options).create_page()
-    scoped_page.save_to_disk()
+    result = scoped_page.save_to_disk()
 
     # assert
     assert scoped_page_file.exists()
-    assert caplog.records[0].message == f"Saved {scoped_page_file} to disk"
+    assert isinstance(result, Success)
+    assert result.message == str(scoped_page_file)
     with scoped_page_file.open("r", encoding="utf-8") as scoped_page_contents:
         assert scoped_page_contents.readlines() == [
             "scoped page file\n",
@@ -193,11 +195,12 @@ def test_create_tokened_page_tokens_in_template(
 
     # act
     scoped_page = ScopedPageCreator(options).create_page()
-    scoped_page.save_to_disk()
+    result = scoped_page.save_to_disk()
 
     # assert
     assert scoped_page_file.exists()
-    assert caplog.records[0].message == f"Saved {scoped_page_file} to disk"
+    assert isinstance(result, Success)
+    assert result.message == str(scoped_page_file)
 
     with scoped_page_file.open("r", encoding="utf-8") as scoped_page_contents:
         assert scoped_page_contents.readline() == page_contents
@@ -236,11 +239,12 @@ def test_create_tokened_page_tokens_in_filename(
 
     # act
     scoped_page = ScopedPageCreator(options).create_page()
-    scoped_page.save_to_disk()
+    result = scoped_page.save_to_disk()
 
     # assert
     assert scoped_page_file.exists()
-    assert caplog.records[0].message == f"Saved {scoped_page_file} to disk"
+    assert isinstance(result, Success)
+    assert result.message == str(scoped_page_file)
 
 
 def test_create_tokened_page_input_tokens_preserve_order(datadir, caplog):
@@ -263,11 +267,12 @@ def test_create_tokened_page_input_tokens_preserve_order(datadir, caplog):
 
     # act
     scoped_page = ScopedPageCreator(options).create_page()
-    scoped_page.save_to_disk()
+    result = scoped_page.save_to_disk()
 
     # assert
     assert scoped_page_file.exists()
-    assert caplog.records[0].message == f"Saved {scoped_page_file} to disk"
+    assert isinstance(result, Success)
+    assert result.message == str(scoped_page_file)
     with scoped_page_file.open(mode="r", encoding="utf-8") as scoped_page_contents:
         assert scoped_page_contents.readline() == "third_input second_input"
 
@@ -324,11 +329,12 @@ def test_create_page_spaces_in_path(tmpdir, caplog):
 
     # act
     scoped_page = ScopedPageCreator(options).create_page()
-    scoped_page.save_to_disk()
+    result = scoped_page.save_to_disk()
 
     # assert
     assert scoped_page_file.exists()
-    assert caplog.records[0].message == f"Saved {scoped_page_file} to disk"
+    assert isinstance(result, Success)
+    assert result.message == str(scoped_page_file)
 
 
 def test_create_page_dot_in_extension(tmpdir, caplog):
@@ -350,11 +356,12 @@ def test_create_page_dot_in_extension(tmpdir, caplog):
 
     # act
     scoped_page = ScopedPageCreator(options).create_page()
-    scoped_page.save_to_disk()
+    result = scoped_page.save_to_disk()
 
     # assert
     assert scoped_page_file.exists()
-    assert caplog.records[0].message == f"Saved {scoped_page_file} to disk"
+    assert isinstance(result, Success)
+    assert result.message == str(scoped_page_file)
 
 
 def test_create_page_str_representation(tmpdir):
@@ -378,4 +385,4 @@ def test_create_page_str_representation(tmpdir):
     scoped_page = ScopedPageCreator(options).create_page()
 
     # assert
-    assert str(scoped_page) == f"ScopedPage({scoped_page_file})"
+    assert str(scoped_page) == f"ScopedPage(\"{scoped_page_file}\")"