wire up new TOML views

2 files changed, 62 insertions, 20 deletions

diff --git a/python/tests/web_editing.py b/python/tests/web_editing.py
index 17f4f5ae..ea244388 100644
--- a/python/tests/web_editing.py
+++ b/python/tests/web_editing.py
@@ -2,7 +2,7 @@
 from fixtures import *
 
 
-def test_web_release_create_merge(app_admin, api):
+def test_web_release_create_accept(app_admin, api):
 
     eg = quick_eg(api)
 
@@ -129,18 +129,60 @@ def test_web_file_create(app_admin, api):
         follow_redirects=True)
     assert rv.status_code == 200
 
+DUMMY_DEMO_ENTITIES = {
+    'container': 'aaaaaaaaaaaaaeiraaaaaaaaam',
+    'creator': 'aaaaaaaaaaaaaircaaaaaaaaaq',
+    'file': 'aaaaaaaaaaaaamztaaaaaaaaam',
+    'fileset': 'aaaaaaaaaaaaaztgaaaaaaaaai',
+    'webcapture': 'aaaaaaaaaaaaa53xaaaaaaaaai',
+    'release': 'aaaaaaaaaaaaarceaaaaaaaaai',
+    'work': 'aaaaaaaaaaaaavkvaaaaaaaaai',
+}
 
 def test_web_edit_get(app_admin):
 
     # these are all existing entities
-    rv = app_admin.get('/release/aaaaaaaaaaaaarceaaaaaaaaai/edit')
-    assert rv.status_code == 200
-    assert b'A bigger example' in rv.data
-
-    rv = app_admin.get('/file/aaaaaaaaaaaaamztaaaaaaaaam/edit')
-    assert rv.status_code == 200
-    assert b'ffc1005680cb620eec4c913437dfabbf311b535cfe16cbaeb2faec1f92afc362' in rv.data
-
-    rv = app_admin.get('/container/aaaaaaaaaaaaaeiraaaaaaaaam/edit')
-    assert rv.status_code == 200
-    assert b'1549-1277' in rv.data
+    for entity_type in ['release', 'file', 'container']:
+        rv = app_admin.get(f'/{entity_type}/{DUMMY_DEMO_ENTITIES[entity_type]}/edit')
+        assert rv.status_code == 200
+        if entity_type == 'release':
+            assert b'A bigger example' in rv.data
+        elif entity_type == 'file':
+            assert b'ffc1005680cb620eec4c913437dfabbf311b535cfe16cbaeb2faec1f92afc362' in rv.data
+        elif entity_type == 'container':
+            assert b'1549-1277' in rv.data
+
+        rv = app_admin.get(f'/{entity_type}/{DUMMY_DEMO_ENTITIES[entity_type]}/edit/toml')
+        assert rv.status_code == 200
+        if entity_type == 'release':
+            assert b'A bigger example' in rv.data
+        elif entity_type == 'file':
+            assert b'ffc1005680cb620eec4c913437dfabbf311b535cfe16cbaeb2faec1f92afc362' in rv.data
+        elif entity_type == 'container':
+            assert b'1549-1277' in rv.data
+
+    # TOML-only endpoints
+    for entity_type in ['creator', 'fileset', 'webcapture', 'work']:
+        rv = app_admin.get(f'/{entity_type}/{DUMMY_DEMO_ENTITIES[entity_type]}/edit')
+        assert rv.status_code == 302
+
+        rv = app_admin.get(f'/{entity_type}/{DUMMY_DEMO_ENTITIES[entity_type]}/edit/toml')
+        assert rv.status_code == 200
+
+
+def test_web_create_get(app_admin):
+
+    for entity_type in ['release', 'file', 'container']:
+        rv = app_admin.get(f'/{entity_type}/create')
+        assert rv.status_code == 200
+
+        rv = app_admin.get(f'/{entity_type}/create/toml')
+        assert rv.status_code == 200
+
+    # these are TOML only
+    for entity_type in ['creator', 'fileset', 'webcapture', 'work']:
+        rv = app_admin.get(f'/{entity_type}/create')
+        assert rv.status_code == 302
+
+        rv = app_admin.get(f'/{entity_type}/create/toml')
+        assert rv.status_code == 200
diff --git a/python/tests/web_entity_views.py b/python/tests/web_entity_views.py
index b01bd815..7b973ef2 100644
--- a/python/tests/web_entity_views.py
+++ b/python/tests/web_entity_views.py
@@ -210,9 +210,9 @@ def test_web_creator(app):
     rv = app.get('/creator/aaaaaaaaaaaaaircaaaaaaaaai')
     assert rv.status_code == 200
     rv = app.get('/creator/aaaaaaaaaaaaaircaaaaaaaaai/edit')
-    assert rv.status_code == 404
+    assert rv.status_code == 302
     rv = app.get('/creator/create')
-    assert rv.status_code == 404
+    assert rv.status_code == 302
 
 
 def test_web_file(app):
@@ -266,9 +266,9 @@ def test_web_fileset(app):
     rv = app.get('/fileset/aaaaaaaaaaaaaztgaaaaaaaaai')
     assert rv.status_code == 200
     rv = app.get('/fileset/aaaaaaaaaaaaaztgaaaaaaaaai/edit')
-    assert rv.status_code == 404
+    assert rv.status_code == 302
     rv = app.get('/fileset/create')
-    assert rv.status_code == 404
+    assert rv.status_code == 302
 
 
 def test_web_webcatpure(app):
@@ -277,9 +277,9 @@ def test_web_webcatpure(app):
     rv = app.get('/webcapture/aaaaaaaaaaaaa53xaaaaaaaaai')
     assert rv.status_code == 200
     rv = app.get('/webcapture/aaaaaaaaaaaaa53xaaaaaaaaai/edit')
-    assert rv.status_code == 404
+    assert rv.status_code == 302
     rv = app.get('/webcapture/create')
-    assert rv.status_code == 404
+    assert rv.status_code == 302
 
 
 def test_web_release(app):
@@ -376,6 +376,6 @@ def test_web_work(app):
     rv = app.get('/work/aaaaaaaaaaaaavkvaaaaaaaaai')
     assert rv.status_code == 200
     rv = app.get('/work/aaaaaaaaaaaaavkvaaaaaaaaai/edit')
-    assert rv.status_code == 404
+    assert rv.status_code == 302
     rv = app.get('/work/create')
-    assert rv.status_code == 404
+    assert rv.status_code == 302