diff --git a/deploy/setup/opentree-shared.conf b/deploy/setup/opentree-shared.conf index 0eb5651..70ce2da 100644 --- a/deploy/setup/opentree-shared.conf +++ b/deploy/setup/opentree-shared.conf @@ -33,6 +33,11 @@ # ------------------------------------------------------------ # Public v3 API (originally cloned from v2) + + # *** ATTENTION! If you edit these directives, also please change + # *** the translations list at the bottom of ws-tests/opentreetesting.py + # *** to match. + # phylesystem-api is provided via web2py # N.B. that we should match "bare" URLs like '/v3/study' to create a resource! RewriteEngine on diff --git a/ws-tests/opentreetesting.py b/ws-tests/opentreetesting.py index a8e95f8..8831081 100644 --- a/ws-tests/opentreetesting.py +++ b/ws-tests/opentreetesting.py @@ -255,7 +255,11 @@ def writable_api_host_and_oauth_or_exit(fn): # Mimic the behavior of apache so that services can be tested without # having apache running. See deploy/setup/opentree-shared.conf -translations = [('/v2/study/', '/phylesystem/v1/study/'), +translations = [# phylesystem-api + ('/v3/study', '/phylesystem/v1/study'), + ('/v3/collection', '/phylesystem/v1/collection'), + ('/v3/amendment', '/phylesystem/v1/amendment'), + ('/v2/study/', '/phylesystem/v1/study/'), ('/cached/', '/phylesystem/default/cached/'), # treemachine ('/v2/graph/', '/db/data/ext/graph/graphdb/'),