Update test

Author: aclark4life

django_mongodb_backend/utils.py

@@ -8,6 +8,7 @@
 from django.utils.functional import SimpleLazyObject
 from django.utils.text import format_lazy
 from django.utils.version import get_version_tuple
+from pymongo.encryption_options import AutoEncryptionOpts
 from pymongo.uri_parser import parse_uri as pymongo_parse_uri
 
 
@@ -33,11 +34,11 @@ def get_auto_encryption_options(crypt_shared_lib_path=None):
     key_vault_collection_name = "__keyVault"
     key_vault_namespace = f"{key_vault_database_name}.{key_vault_collection_name}"
     kms_providers = {}
-    return {
-        "kms_providers": kms_providers,
-        "key_vault_namespace": key_vault_namespace,
-        "crypt_shared_lib_path": crypt_shared_lib_path,
-    }
+    return AutoEncryptionOpts(
+        key_vault_namespace=key_vault_namespace,
+        kms_providers=kms_providers,
+        crypt_shared_lib_path=crypt_shared_lib_path,
+    )
 
 
 def parse_uri(uri, *, auto_encryption_options=None, db_name=None, test=None):
@@ -62,7 +63,7 @@ def parse_uri(uri, *, auto_encryption_options=None, db_name=None, test=None):
         raise ImproperlyConfigured("You must provide the db_name parameter.")
     options = uri.get("options")
     if auto_encryption_options:
-        options = {**uri.get("options"), **auto_encryption_options}
+        options = {**uri.get("options"), "auto_encryption_options": auto_encryption_options}
     settings_dict = {
         "ENGINE": "django_mongodb_backend",
         "NAME": db_name,

tests/backend_/utils/test_parse_uri.py

@@ -100,9 +100,5 @@ def test_no_scheme(self):
 class ParseUriOptionsTests(TestCase):
     @skipUnlessDBFeature("supports_queryable_encryption")
     def test_auto_encryption_options(self):
-        auto_encryption_options = get_auto_encryption_options()
-        settings_dict = parse_uri(
-            "mongodb://cluster0.example.mongodb.net/myDatabase",
-            auto_encryption_options=auto_encryption_options,
-        )
-        self.assertEqual(settings_dict["OPTIONS"]["key_vault_namespace"], "encryption.__keyVault")
+        auto_encryption_options = get_auto_encryption_options(crypt_shared_lib_path="/path/to/lib")
+        parse_uri("mongodb://localhost/db", auto_encryption_options=auto_encryption_options)