dcor-shared 0.7.1__tar.gz → 0.7.2__tar.gz

{dcor_shared-0.7.1 → dcor_shared-0.7.2}/CHANGELOG

@@ -1,3 +1,5 @@
+0.7.2
+ - tests: fix invalid make_dataset method
 0.7.1
  - fix: handle non-existent bucket when S3 object is missing
  - docs: be more verbose in s3cc docstrings

{dcor_shared-0.7.1 → dcor_shared-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcor_shared
-Version: 0.7.1
+Version: 0.7.2
 Summary: Functionalities shared by the DCOR CKAN extensions
 Home-page: https://github.com/DCOR-dev/dcor_shared
 Author: Paul Müller

{dcor_shared-0.7.1 → dcor_shared-0.7.2}/dcor_shared/_version_save.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python
 # This file was created automatically
-longversion = '0.7.1'
+longversion = '0.7.2'

{dcor_shared-0.7.1 → dcor_shared-0.7.2}/dcor_shared/testing.py

@@ -35,7 +35,7 @@ def create_with_upload_no_temp(clean_db, ckan_config, monkeypatch):
 
 
 def make_dataset(create_context, owner_org, create_with_upload=None,
-                 activate=False, **kwargs):
+                 resource_path=None, activate=False, **kwargs):
     if "title" not in kwargs:
         kwargs["title"] = "test-dataset"
     if "authors" not in kwargs:
@@ -52,7 +52,10 @@ def make_dataset(create_context, owner_org, create_with_upload=None,
                              )
 
     if create_with_upload is not None:
-        rs = make_resource(create_with_upload, create_context, ds["id"])
+        rs = make_resource(resource_path=resource_path,
+                           create_with_upload=create_with_upload,
+                           create_context=create_context,
+                           dataset_id=ds["id"])
 
     if activate:
         helpers.call_action("package_patch", create_context,

{dcor_shared-0.7.1 → dcor_shared-0.7.2}/dcor_shared.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcor-shared
-Version: 0.7.1
+Version: 0.7.2
 Summary: Functionalities shared by the DCOR CKAN extensions
 Home-page: https://github.com/DCOR-dev/dcor_shared
 Author: Paul Müller

{dcor_shared-0.7.1 → dcor_shared-0.7.2}/dcor_shared.egg-info/SOURCES.txt

@@ -23,4 +23,5 @@ dcor_shared.egg-info/top_level.txt
 tests/test_basic.py
 tests/test_data.py
 tests/test_s3.py
-tests/test_s3cc.py
+tests/test_s3cc.py
+tests/test_testing.py

dcor_shared-0.7.2/tests/test_testing.py

@@ -0,0 +1,46 @@
+import pathlib
+import pytest
+
+import ckan.tests.factories as factories
+
+from dcor_shared.testing import make_dataset
+
+data_path = pathlib.Path(__file__).parent / "data"
+
+
+@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas')
+@pytest.mark.usefixtures('clean_db', 'with_request_context')
+def test_make_dataset():
+    user = factories.User()
+    owner_org = factories.Organization(users=[{
+        'name': user['id'],
+        'capacity': 'admin'
+    }])
+    # Note: `call_action` bypasses authorization!
+    create_context = {'ignore_auth': False,
+                      'user': user['name'], 'api_version': 3}
+    ds_dict = make_dataset(create_context, owner_org,
+                           activate=False)
+    assert ds_dict["state"] == "draft"
+
+
+@pytest.mark.ckan_config('ckan.plugins', 'dcor_schemas')
+@pytest.mark.usefixtures('clean_db', 'with_request_context')
+def test_make_dataset_with_resource(create_with_upload):
+    user = factories.User()
+    owner_org = factories.Organization(users=[{
+        'name': user['id'],
+        'capacity': 'admin'
+    }])
+    # Note: `call_action` bypasses authorization!
+    create_context = {'ignore_auth': False,
+                      'user': user['name'], 'api_version': 3}
+    # upload a *valid* [sic] .rtdc File (this is the control)
+    ds_dict, res_dict = make_dataset(
+        create_context, owner_org,
+        create_with_upload=create_with_upload,
+        resource_path=data_path / "calibration_beads_47.rtdc",
+        activate=True)
+    assert len(ds_dict["resources"]) == 1
+    assert "id" in res_dict
+    assert res_dict["package_id"] == ds_dict["id"]