diff tests/mockutil.py @ 974:72f17534d58e

tests: First pass on making unit tests work again. - Fix all imports - Add more helper functions to work with mock file-systems - Simplify some code by running chef directly on the mock FS - Fix a couple tests
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 17 Oct 2017 01:07:30 -0700
parents fd694f1297c7
children 8adc27285d93
line wrap: on
line diff
--- a/tests/mockutil.py	Tue Oct 17 01:04:10 2017 -0700
+++ b/tests/mockutil.py	Tue Oct 17 01:07:30 2017 -0700
@@ -1,8 +1,6 @@
-import os.path
 import mock
-from piecrust.app import PieCrust, PieCrustConfiguration
-from piecrust.page import Page
-from piecrust.rendering import QualifiedPage, PageRenderingContext, render_page
+from piecrust.app import PieCrust
+from piecrust.appconfig import PieCrustConfiguration
 
 
 def get_mock_app(config=None):
@@ -11,20 +9,21 @@
     return app
 
 
-def get_simple_page(app, rel_path):
-    source = app.getSource('pages')
-    metadata = {'slug': os.path.splitext(rel_path)[0]}
-    return Page(source, metadata, rel_path)
+def get_simple_content_item(app, slug):
+    src = app.getSource('pages')
+    assert src is not None
+
+    item = src.findContent({'slug': slug})
+    assert item is not None
+    return item
 
 
-def render_simple_page(page, route, route_metadata):
-    qp = QualifiedPage(page, route, route_metadata)
-    ctx = PageRenderingContext(qp)
-    rp = render_page(ctx)
-    return rp.content
+def get_simple_page(app, slug):
+    src = app.getSource('pages')
+    item = get_simple_content_item(app, slug)
+    return app.getPage(src, item)
 
 
-from .tmpfs import (
-        TempDirFileSystem as mock_fs,
-        TempDirScope as mock_fs_scope)
-
+from .tmpfs import (  # NOQA
+    TempDirFileSystem as mock_fs,
+    TempDirScope as mock_fs_scope)