diff --git a/tests/interact_support.py b/tests/interact_support.py index 0a3c87581..48965aaaa 100644 --- a/tests/interact_support.py +++ b/tests/interact_support.py @@ -40,12 +40,12 @@ from leaf import publishing as publishing_model from leaf import revisioning as revisioning_model from leaf import schema as schema_model -from leaf.served_state import page as served_page from leaf import server as server_model from leaf import service as service_model from leaf import session as session_model from leaf import structure as structure_model from leaf import vendoring as vendoring_model +from leaf.served_state import page as served_page from leaf.validation import instances as validation_model ROOT = Path(__file__).parent.parent @@ -261,9 +261,7 @@ def stamp(d, version, text="stamped", completes=()): def page_state(d): events = events_model.read_events(d) - return served_page.full_state( - d, events, files_model.published_versions(d, events) - ) + return served_page.full_state(d, events, files_model.published_versions(d, events)) def record_claim(page, **fields): diff --git a/tests/render_cases_layout.py b/tests/render_cases_layout.py index 25af1a051..5c517ae53 100644 --- a/tests/render_cases_layout.py +++ b/tests/render_cases_layout.py @@ -18,8 +18,8 @@ from leaf import host as host_model from leaf import hosting as hosting_model from leaf import http as http_model -from leaf.registry import storage as registry_storage from leaf import render_checks as render_checks_model +from leaf.registry import storage as registry_storage from leaf.render_gate import scheme as render_gate_model from playwright.sync_api import TimeoutError as PlaywrightTimeout from playwright.sync_api import expect diff --git a/tests/render_cases_widgets.py b/tests/render_cases_widgets.py index c2a75330c..408a77f33 100644 --- a/tests/render_cases_widgets.py +++ b/tests/render_cases_widgets.py @@ -30,7 +30,10 @@ def written_anchors(page_dir, html, limit=40): continue try: anchors.append( - (quote, anchor_capture_model.capture_anchor(html, registry, quote, None)) + ( + quote, + anchor_capture_model.capture_anchor(html, registry, quote, None), + ) ) except ValueError: continue diff --git a/tests/test_interact_contract.py b/tests/test_interact_contract.py index 820a8b736..bf20ad269 100644 --- a/tests/test_interact_contract.py +++ b/tests/test_interact_contract.py @@ -57,14 +57,14 @@ from leaf import leases as leases_model from leaf import media as media_model from leaf import passages as passages_model -from leaf.registry import contract as registry_contract -from leaf.registry import layer as registry_layer -from leaf.registry import storage as registry_storage -from leaf.registry import validation as registry_validation from leaf import schema as schema_model from leaf import structure as structure_model from leaf import styles as styles_model from leaf import vendoring as vendoring_model +from leaf.registry import contract as registry_contract +from leaf.registry import layer as registry_layer +from leaf.registry import storage as registry_storage +from leaf.registry import validation as registry_validation from leaf.render_gate import preview as render_gate_model diff --git a/tests/test_interact_product.py b/tests/test_interact_product.py index 8cd5887f0..58afd547c 100644 --- a/tests/test_interact_product.py +++ b/tests/test_interact_product.py @@ -7,6 +7,7 @@ import shutil from pathlib import Path +import leaf.validation.command as checking_command import pytest from click.testing import CliRunner from interact_support import ( @@ -26,17 +27,16 @@ published, state_json, ) -import leaf.validation.command as checking_command from leaf import cli as cli_model from leaf import conversation as conversation_model from leaf import data as data_model from leaf import event_log as events_model from leaf import files as files_model from leaf import layer as layer_model -from leaf.registry import storage as registry_storage from leaf import revisioning as revisioning_model from leaf import schema as schema_model from leaf import service as service_model +from leaf.registry import storage as registry_storage from leaf.validation import compatibility as validation_model diff --git a/tests/test_interact_server.py b/tests/test_interact_server.py index 5fbe85060..0f9ac1bbd 100644 --- a/tests/test_interact_server.py +++ b/tests/test_interact_server.py @@ -41,14 +41,14 @@ from leaf import presence as presence_model from leaf import projection as projection_model from leaf import publishing as publishing_model -from leaf.registry import storage as registry_storage from leaf import render_checks as render_checks_model from leaf import schema as schema_model -from leaf.served_state import document as served_document -from leaf.served_state import page as served_page from leaf import server as server_model from leaf import service as service_model from leaf import thread_context as thread_context_model +from leaf.registry import storage as registry_storage +from leaf.served_state import document as served_document +from leaf.served_state import page as served_page def test_an_event_from_another_layer_is_not_interpreted_or_appended(server, page_dir): diff --git a/tests/test_interact_session.py b/tests/test_interact_session.py index 91e2c554b..4c31dbf01 100644 --- a/tests/test_interact_session.py +++ b/tests/test_interact_session.py @@ -51,15 +51,15 @@ from leaf import layer as layer_model from leaf import leases as leases_model from leaf import presence as presence_model -from leaf.registry import contract as registry_contract -from leaf.registry import storage as registry_storage from leaf import schema as schema_model -from leaf.served_state import page as served_page from leaf import server as server_model from leaf import service as service_model from leaf import session as session_model from leaf import thread_context as thread_context_model from leaf import vendoring as vendoring_model +from leaf.registry import contract as registry_contract +from leaf.registry import storage as registry_storage +from leaf.served_state import page as served_page def test_a_work_line_says_which_thread_the_agent_is_on(page_dir, capsys, monkeypatch): diff --git a/tests/test_render_controls.py b/tests/test_render_controls.py index 250b38b00..08763b10e 100644 --- a/tests/test_render_controls.py +++ b/tests/test_render_controls.py @@ -11,8 +11,8 @@ from leaf import files as files_model from leaf import hosting as hosting_model from leaf import http as http_model -from leaf.registry import storage as registry_storage from leaf import schema as schema_model +from leaf.registry import storage as registry_storage from playwright.sync_api import TimeoutError as PlaywrightTimeout from playwright.sync_api import expect from render_support import ( diff --git a/tests/test_render_pages.py b/tests/test_render_pages.py index fc755bb95..3f39cf0da 100644 --- a/tests/test_render_pages.py +++ b/tests/test_render_pages.py @@ -8,10 +8,10 @@ from leaf import cli as cli_model from leaf import event_log as events_model from leaf import exporting as exporting_model -from leaf.registry import storage as registry_storage from leaf import render_checks as render_checks_model from leaf import schema as schema_model from leaf import structure as structure_model +from leaf.registry import storage as registry_storage from leaf.render_gate import version as render_gate_model from playwright.sync_api import TimeoutError as PlaywrightTimeout from playwright.sync_api import expect