Update test

Author: aclark4life

django_mongodb_backend/utils.py

@@ -8,7 +8,6 @@
 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
 
 
@@ -34,12 +33,14 @@ 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 AutoEncryptionOpts(
-        kms_providers, key_vault_namespace, crypt_shared_lib_path=crypt_shared_lib_path
-    )
+    return {
+        "kms_providers": kms_providers,
+        "key_vault_namespace": key_vault_namespace,
+        "crypt_shared_lib_path": crypt_shared_lib_path,
+    }
 
 
-def parse_uri(uri, *, db_name=None, test=None):
+def parse_uri(uri, *, auto_encryption_options=None, db_name=None, test=None):
     """
     Convert the given uri into a dictionary suitable for Django's DATABASES
     setting.
@@ -59,14 +60,17 @@ def parse_uri(uri, *, db_name=None, test=None):
     db_name = db_name or uri["database"]
     if not db_name:
         raise ImproperlyConfigured("You must provide the db_name parameter.")
+    options = uri.get("options")
+    if auto_encryption_options:
+        options = {**uri.get("options"), **auto_encryption_options}
     settings_dict = {
         "ENGINE": "django_mongodb_backend",
         "NAME": db_name,
         "HOST": host,
         "PORT": port,
         "USER": uri.get("username"),
         "PASSWORD": uri.get("password"),
-        "OPTIONS": uri.get("options"),
+        "OPTIONS": options,
     }
     if "authSource" not in settings_dict["OPTIONS"] and uri["database"]:
         settings_dict["OPTIONS"]["authSource"] = uri["database"]

tests/backend_/utils/test_parse_uri.py

@@ -96,9 +96,13 @@ def test_no_scheme(self):
             parse_uri("cluster0.example.mongodb.net")
 
 
-# TODO: This can go in `test_features` once transaction support is added.
+# TODO: This can be moved to `test_features` once transaction support is merged.
 class ParseUriOptionsTests(TestCase):
     @skipUnlessDBFeature("supports_queryable_encryption")
-    def test_queryable_encryption_config(self):
+    def test_auto_encryption_options(self):
         auto_encryption_options = get_auto_encryption_options()
-        self.assertEqual(auto_encryption_options._key_vault_namespace, "encryption.__keyVault")
+        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")