From 9206624242983d2fb9ea76111c87fbed46de6403 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Fri, 9 Aug 2024 14:30:09 +0000
Subject: [PATCH] fix(tests): auth tests;

- Fix the auth test cases.
---
 ckanext/validation/tests/test_logic.py | 30 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/ckanext/validation/tests/test_logic.py b/ckanext/validation/tests/test_logic.py
index 90046f29..1271a152 100644
--- 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,8 +368,9 @@ 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}
 
@@ -376,7 +378,7 @@ def test_run_auth_user(self):
             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,8 +439,9 @@ 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}
 
@@ -445,7 +449,7 @@ def test_delete_auth_user(self):
             call_auth(
                 "resource_validation_delete",
                 context=context,
-                resource_id=dataset["resources"][0]["id"],
+                resource_id=resource["id"],
             )
             is True
         )
@@ -468,8 +472,9 @@ def test_show_anon_public_dataset(self):
         user = factories.User()
         org = factories.Organization()
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()], private=False
+            owner_org=org["id"], private=False
         )
+        resource = factories.Resource(package_id=dataset["id"])
 
         context = {"user": user["name"], "model": model}
 
@@ -477,7 +482,7 @@ def test_show_anon_public_dataset(self):
             call_auth(
                 "resource_validation_show",
                 context=context,
-                resource_id=dataset["resources"][0]["id"],
+                resource_id=resource["id"],
             )
             is True
         )
@@ -487,8 +492,9 @@ def test_show_anon_private_dataset(self):
         user = factories.User()
         org = factories.Organization()
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()], private=True
+            owner_org=org["id"], private=True
         )
+        resource = factories.Resource(package_id=dataset["id"])
 
         context = {"user": user["name"], "model": model}
 
@@ -497,7 +503,7 @@ def test_show_anon_private_dataset(self):
             call_auth,
             "resource_validation_run",
             context=context,
-            resource_id=dataset["resources"][0]["id"],
+            resource_id=resource["id"],
         )