@W-14603959 - Update backend deps and test failure fixes

config/settings/base.py

@@ -121,6 +121,7 @@ def safe_key() -> str:
 MIDDLEWARE = [
     "metecho.logging_middleware.LoggingMiddleware",
     "sfdo_template_helpers.admin.middleware.AdminRestrictMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",

docs/api/schema.yml

@@ -1871,6 +1871,11 @@ components:
       - Review
       - Merged
       type: string
+      description: |-
+        * `Planned` - Planned
+        * `In progress` - In Progress
+        * `Review` - Review
+        * `Merged` - Merged
     FullUser:
       type: object
       properties:
@@ -2118,6 +2123,10 @@ components:
       - QA
       - Playground
       type: string
+      description: |-
+        * `Dev` - Dev
+        * `QA` - QA
+        * `Playground` - Playground
     PaginatedEpicList:
       type: object
       properties:
@@ -2481,11 +2490,17 @@ components:
       - Approved
       - Changes requested
       type: string
+      description: |-
+        * `Approved` - Approved
+        * `Changes requested` - Changes Requested
     RoleEnum:
       enum:
       - assigned_qa
       - assigned_dev
       type: string
+      description: |-
+        * `assigned_qa` - assigned_qa
+        * `assigned_dev` - assigned_dev
     ScratchOrg:
       type: object
       properties:
@@ -2909,6 +2924,11 @@ components:
       - Completed
       - Canceled
       type: string
+      description: |-
+        * `Planned` - Planned
+        * `In progress` - In Progress
+        * `Completed` - Completed
+        * `Canceled` - Canceled
   securitySchemes:
     cookieAuth:
       type: apiKey

metecho/api/models.py

@@ -716,8 +716,9 @@ def __str__(self):
         return self.name
 
     def save(self, *args, **kwargs):
+        obj = super().save(*args, **kwargs)
         self.update_status()
-        return super().save(*args, **kwargs)
+        return obj
 
     def subscribable_by(self, user):  # pragma: nocover
         return True

metecho/api/tests/admin.py

@@ -42,7 +42,7 @@ def test_queryset__deleted(self, epic_factory):
 
         args = (
             None,
-            {"deleted_at": "true"},
+            {"deleted_at": ["true"]},
             None,
             None,
         )

metecho/oauth2/salesforce/tests/provider.py

@@ -1,14 +1,26 @@
 from ..provider import CustomSalesforceProvider
+from allauth.socialaccount.models import SocialApp
+import pytest
 
+@pytest.fixture
+def dummy():
+    app = SocialApp.objects.create(
+        provider=CustomSalesforceProvider.id,
+        name=CustomSalesforceProvider.id,
+        client_id="app123id",
+        key=CustomSalesforceProvider.id,
+        secret="dummy",)
+    return app
 
-def test_get_auth_params(rf):
+@pytest.mark.django_db
+def test_get_auth_params(rf, dummy):
     request = rf.get("/")
-    result = CustomSalesforceProvider(request).get_auth_params(request, None)
+    result = CustomSalesforceProvider(request, dummy).get_auth_params(request, None)
     assert "prompt" in result and result["prompt"] == "login"
 
-
+@pytest.mark.django_db
 def test_extract_uid(rf):
     request = rf.get("/")
-    provider = CustomSalesforceProvider(request)
+    provider = CustomSalesforceProvider(request, dummy)
     result = provider.extract_uid({"organization_id": "ORG", "user_id": "USER"})
     assert result == "ORG/USER"

metecho/oauth2/views.py

@@ -19,7 +19,7 @@ def ensure_socialapp_in_db(token):
     unless we create them here.
     """
     if token.app.pk is None:
-        provider = providers.registry.by_id(token.app.provider)
+        provider = providers.registry.get_class(token.app.provider)
         app, created = SocialApp.objects.get_or_create(
             provider=provider.id,
             name=provider.name,