tests fixed

oarepo · Feb 9, 2024 · bb24c70 · bb24c70
1 parent 8a560aa
commit bb24c70
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/oarepo_model_builder/datatypes/components/model/ui.py b/oarepo_model_builder/datatypes/components/model/ui.py
@@ -101,5 +101,5 @@ def before_model_prepare(self, datatype, **kwargs):
             "format_serializer_cls", "flask_resources.serializers.JSONSerializer"
         )
         json.setdefault(
-            "schema_context_args", {'"object_key"': '"ui"', '"identity"': "{{ flask.g{g.identity} }}"}
+            "schema-context-args", {'"object_key"': '"ui"', '"identity"': "{{ flask.g{g.identity} }}"}
         )
diff --git a/tests/test_datatype_prepare.py b/tests/test_datatype_prepare.py
@@ -1,6 +1,5 @@
 from oarepo_model_builder.schema import ModelSchema
 
-
 def test_prepare_datatype():
     module = "my.test"
     model = ModelSchema(
@@ -23,6 +22,7 @@ def test_prepare_datatype():
         },
     )
     record_section = model.get_schema_section(profile="record", section="record")
+
     assert record_section.definition == {
         "api-blueprint": {
             "alias": "my_test_record",
@@ -78,6 +78,7 @@ def test_prepare_datatype():
             "imports": [],
             "list_schema_cls": "flask_resources.BaseListSchema",
             "module": "my.test.resources.records.ui",
+            "schema-context-args": {'"object_key"': '"ui"', '"identity"': "{{ flask.g{g.identity} }}"}
         },
         "mapping": {
             "alias": "my_test_record",
@@ -267,6 +268,7 @@ def test_prepare_datatype():
             "generate": True,
             "module": "my.test.services.records.config",
             "service-id": "test",
+            "result-item-class": "invenio_records_resources.services.records.results.RecordItem",
             "result-list-class": "oarepo_runtime.services.results.RecordList",
         },
         "sortable": [],

diff --git a/tests/test_marshmallow_ui_builder.py b/tests/test_marshmallow_ui_builder.py
@@ -552,6 +552,7 @@ def test_generate_json_serializer(fulltext_builder):
 from test.services.records.ui_schema import TestUISchema
 from flask_resources.serializers import JSONSerializer
 from flask_resources import BaseListSchema
+from flask import g
 
 
 
@@ -564,7 +565,7 @@ def __init__(self):
             format_serializer_cls=JSONSerializer,
             object_schema_cls=TestUISchema,
             list_schema_cls=BaseListSchema,
-            schema_context={"object_key": "ui"},
+            schema_context={"object_key": "ui", "identity": g.identity}
         )    
     '''
         )

diff --git a/tests/test_model_saver.py b/tests/test_model_saver.py
@@ -205,6 +205,7 @@ def test_model_saver():
                 "invenio_records_resources.services.RecordServiceConfig{InvenioRecordServiceConfig}",
             ],
             "components": [],
+            "result-item-class": "invenio_records_resources.services.records.results.RecordItem",
             "result-list-class": "oarepo_runtime.services.results.RecordList",
         },
         "service": {
@@ -238,6 +239,7 @@ def test_model_saver():
             "generate": True,
             "list_schema_cls": "flask_resources.BaseListSchema",
             "format_serializer_cls": "flask_resources.serializers.JSONSerializer",
+            "schema-context-args": {'"identity"': '{{ flask.g{g.identity} }}', '"object_key"': '"ui"'},
         },
         "mapping": {
             "generate": True,
@@ -548,6 +550,7 @@ def test_model_saver_invenio():
                 "invenio_records_resources.services.RecordServiceConfig{InvenioRecordServiceConfig}",
             ],
             "components": [],
+            "result-item-class": "invenio_records_resources.services.records.results.RecordItem",
             "result-list-class": "oarepo_runtime.services.results.RecordList",
         },
         "service": {
@@ -571,6 +574,7 @@ def test_model_saver_invenio():
             "generate": True,
             "list_schema_cls": "flask_resources.BaseListSchema",
             "format_serializer_cls": "flask_resources.serializers.JSONSerializer",
+            "schema-context-args": {'"identity"': '{{ flask.g{g.identity} }}', '"object_key"': '"ui"'},
         },
         "mapping": {
             "generate": True,

diff --git a/tests/test_simple_builders.py b/tests/test_simple_builders.py
@@ -374,10 +374,12 @@ def test_service_config():
 from test.services.records.schema import TestSchema
 from test.services.records.search import TestSearchOptions
 from oarepo_runtime.services.results import RecordList
+from invenio_records_resources.services.records.results import RecordItem
 
 
 class TestServiceConfig(PermissionsPresetsConfigMixin, InvenioRecordServiceConfig):
     """TestRecord service config."""
+    result_item_cls = RecordItem
     result_list_cls = RecordList
     PERMISSIONS_PRESETS = ["everyone"]
     url_prefix = "/test/"
@@ -529,6 +531,7 @@ def test_ui_serializer_builder():
 from test.services.records.ui_schema import TestUISchema
 from flask_resources.serializers import JSONSerializer
 from flask_resources import BaseListSchema
+from flask import g
 
 class TestUIJSONSerializer(LocalizedUIJSONSerializer):
     """UI JSON serializer."""
@@ -539,7 +542,7 @@ def __init__(self):
             format_serializer_cls=JSONSerializer,
             object_schema_cls=TestUISchema,
             list_schema_cls=BaseListSchema,
-            schema_context={"object_key": "ui"},
+            schema_context={ "object_key": "ui", "identity": g.identity }
         )
 '''
     )