Fixing tests

tests/test_requests/test_requests.py

@@ -1,5 +1,5 @@
 import pytest
-from invenio_pidstore.errors import PIDDeletedError, PIDUnregistered
+from invenio_pidstore.errors import PIDDeletedError, PIDUnregistered, PIDDoesNotExistError
 from invenio_records_resources.services.errors import PermissionDeniedError
 from sqlalchemy.orm.exc import NoResultFound
 
@@ -20,8 +20,16 @@ def test_workflow(
         identity_simple, resp1._obj.parent.publish_draft.id, "submit"
     )
 
-    with pytest.raises(NoResultFound):
+    try:
         record_service.read_draft(identity_simple, record_id)
+        raise Exception("Expecting PIDDoesNotExistError for RDM 12 or NoResultFound for RDM 11")
+    except PIDDoesNotExistError:
+        # RDM 12 error
+        pass
+    except NoResultFound:
+        # RDM 11 error
+        pass
+
     resp2 = record_service.read(identity_simple, record_id)
     assert resp2._obj.parent.publish_draft is None
 

tests/test_ui/templates/TestDetail.jinja

@@ -1,5 +1,11 @@
 {#def extra_context #}
-available_requests=
+{
 {% for request_name, request in extra_context.allowed_requests.items() %}
-{{ request_name }}: {{ request }}
+    "{{ request_name }}": {
+        "type": {{ request.type|tojson|safe }},
+        "status": {{ request.status|tojson|safe }},
+        "receiver": {{ request.receiver|tojson|safe }},
+        "actions": {{ request.actions|tojson|safe }}
+    }
 {% endfor %}
+}

tests/test_ui/templates/TestEdit.jinja

@@ -1,11 +1,26 @@
 {#def form_config, extra_context #}
-available_requests=
+{
+"available_requests":
+{
 {% for request_name, request in extra_context.allowed_requests.items() %}
-{{ request_name }}: {{ request }}
+    "{{ request_name }}": {
+        "type": {{ request.type|tojson|safe }},
+        "status": {{ request.status|tojson|safe }},
+        "receiver": {{ request.receiver|tojson|safe }},
+        "actions": {{ request.actions|tojson|safe }}
+    }
 {% endfor %}
-{% if form_config %}
-allowed requests in form config:
+},
+
+"form_config":
+{
 {% for request_name, request in form_config["allowed_requests"].items() %}
-{{ request_name }}: {{ request }}
+    "{{ request_name }}": {
+        "type": {{ request.type|tojson|safe }},
+        "status": {{ request.status|tojson|safe }},
+        "receiver": {{ request.receiver|tojson|safe }},
+        "actions": {{ request.actions|tojson|safe }}
+    }
 {% endfor %}
-{% endif %}
+}
+}

tests/test_ui/test_ui_resource.py

@@ -1,3 +1,6 @@
+import json
+
+
 def test_draft_publish_request_present(
     app, record_ui_resource, example_topic_draft, client_with_login, fake_manifest
 ):
@@ -10,9 +13,9 @@ def check_request(ctext):
 
     with client_with_login.get(f"/thesis/{example_topic_draft['id']}/edit") as c:
         assert c.status_code == 200
-        base_part, form_part = c.text.split("allowed requests in form config:")
-        check_request(base_part)
-        check_request(form_part)
+        data = json.loads(c.text)
+        assert data["available_requests"]["publish_draft"] == {'actions': ['submit', 'delete'], 'receiver': None, 'status': 'created', 'type': 'publish_draft'}
+        assert data["form_config"]["publish_draft"] == {'actions': ['submit', 'delete'], 'receiver': None, 'status': 'created', 'type': 'publish_draft'}
 
 
 def test_draft_publish_unauthorized(
@@ -28,12 +31,12 @@ def test_record_delete_request_present(
 ):
     with client_with_login.get(f"/thesis/{example_topic['id']}") as c:
         assert c.status_code == 200
-        assert "delete_record: " in c.text
-        assert "'type': 'delete_record&#39" in c.text
-        assert "'receiver': None" in c.text
-        assert "'status': 'created'" in c.text
-        assert "'links': {}" in c.text
-        assert "'actions': ['submit']" in c.text
+        data = json.loads(c.text)
+        assert "delete_record" in data
+        assert data["delete_record"]['type'] == "delete_record"
+        assert data["delete_record"]["receiver"] is None
+        assert data["delete_record"]["status"] == "created"
+        assert data["delete_record"]["actions"] == ["submit", "delete"]
 
 
 def test_record_delete_unauthorized(