Failing tests for dispatch returning a result

Author: chadwhitacre

aspen/algorithms/website.py

@@ -61,7 +61,7 @@ def raise_200_for_OPTIONS(request):
 
 
 def dispatch_request_to_filesystem(website, request):
-    dispatcher.dispatch(website, request)
+    return {'dispatch_result': dispatcher.dispatch(website, request)}
 
 
 def apply_typecasters_to_path(website, request):

tests/test_dispatcher.py

@@ -7,7 +7,7 @@
 from pytest import raises
 
 import aspen
-from aspen import Response
+from aspen import dispatcher, Response
 
 
 # Helpers
@@ -43,6 +43,29 @@ def assert_body(harness, uripath, expected_body):
 [-----] text/html
 <h1>Greetings, Program!</h1>"""
 
+
+# dispatcher.dispatch
+# ===================
+
+def test_dispatcher_returns_a_result(harness):
+    request = harness.make_request('Greetings, program!', 'index.html')
+    result = dispatcher.dispatch(harness.client.website, request)
+    assert result.status == dispatcher.DispatchStatus.okay
+    assert result.match == os.path.join(harness.fs.www.root, 'index.html')
+    assert result.wildcards == {}
+    assert result.detail == 'Found.'
+
+def test_dispatcher_returns_a_result_for_autoindex(harness):
+    request = harness.make_request('Greetings, program!', 'index.html')
+    os.remove(request.fs)
+    harness.client.website.list_directories = True
+    result = dispatcher.dispatch(harness.client.website, request)
+    assert result.status == dispatcher.DispatchStatus.okay
+    assert result.match == os.path.join(harness.fs.www.root, '')
+    assert result.wildcards == {}
+    assert result.detail == 'Found.'
+
+
 # Indices
 # =======
 
@@ -462,4 +485,3 @@ def test_dont_serve_hidden_files(harness):
 def test_dont_serve_spt_file_source(harness):
     harness.fs.www.mk(('foo.html.spt', "Greetings, program!"),)
     assert_raises_404(harness, '/foo.html.spt')
-