fix: flip the dataset resource logic around in the tests

ckan · Jul 21, 2023 · 2ffa7e5 · 2ffa7e5
1 parent 71595be
commit 2ffa7e5
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/ckanext/validation/tests/test_logic.py b/ckanext/validation/tests/test_logic.py
@@ -347,8 +347,9 @@ def test_run_non_auth_user(self):
         user = factories.User()
         org = factories.Organization()
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()]
+            owner_org=org["id"]
         )
+        resource = factories.Resource(package_id=dataset['id'])
 
         context = {"user": user["name"], "model": model}
 
@@ -357,7 +358,7 @@ def test_run_non_auth_user(self):
             call_auth,
             "resource_validation_run",
             context=context,
-            resource_id=dataset["resources"][0]["id"],
+            resource_id=resource["id"],
         )
 
     def test_run_auth_user(self):
@@ -367,16 +368,17 @@ def test_run_auth_user(self):
             users=[{"name": user["name"], "capacity": "editor"}]
         )
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()]
+            owner_org=org["id"]
         )
+        resource = factories.Resource(package_id=dataset['id'])
 
         context = {"user": user["name"], "model": model}
 
         assert (
             call_auth(
                 "resource_validation_run",
                 context=context,
-                resource_id=dataset["resources"][0]["id"],
+                resource_id=resource["id"],
             )
             is True
         )
@@ -416,8 +418,9 @@ def test_delete_non_auth_user(self):
         user = factories.User()
         org = factories.Organization()
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()]
+            owner_org=org["id"]
         )
+        resource = factories.Resource(package_id=dataset['id'])
 
         context = {"user": user["name"], "model": model}
 
@@ -426,7 +429,7 @@ def test_delete_non_auth_user(self):
             call_auth,
             "resource_validation_delete",
             context=context,
-            resource_id=dataset["resources"][0]["id"],
+            resource_id=resource["id"],
         )
 
     def test_delete_auth_user(self):
@@ -436,16 +439,17 @@ def test_delete_auth_user(self):
             users=[{"name": user["name"], "capacity": "editor"}]
         )
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()]
+            owner_org=org["id"]
         )
+        resource = factories.Resource(package_id=dataset['id'])
 
         context = {"user": user["name"], "model": model}
 
         assert (
             call_auth(
                 "resource_validation_delete",
                 context=context,
-                resource_id=dataset["resources"][0]["id"],
+                resource_id=resource["id"],
             )
             is True
         )