From b5c769da7d5512b9cd736bae73c9f4d52eefb35a Mon Sep 17 00:00:00 2001
From: Bharath Chadarajupalli <vchadarajupalli@salesforce.com>
Date: Tue, 5 Dec 2023 14:38:58 -0800
Subject: [PATCH] @W-14603959 - code refactoring to fix the test

---
 metecho/oauth2/salesforce/tests/provider.py | 23 ++++++++++++++++-----
 metecho/oauth2/views.py                     |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/metecho/oauth2/salesforce/tests/provider.py b/metecho/oauth2/salesforce/tests/provider.py
index 47252ee93..14b4ef02a 100644
--- a/metecho/oauth2/salesforce/tests/provider.py
+++ b/metecho/oauth2/salesforce/tests/provider.py
@@ -1,14 +1,27 @@
 from ..provider import CustomSalesforceProvider
+from allauth.socialaccount.models import SocialApp
+import pytest
 
+@pytest.fixture
+def dummy_app():
+    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_app):
     request = rf.get("/")
-    result = CustomSalesforceProvider(request).get_auth_params(request, None)
+    result = CustomSalesforceProvider(request, dummy_app).get_auth_params(request, None)
     assert "prompt" in result and result["prompt"] == "login"
 
-
-def test_extract_uid(rf):
+@pytest.mark.django_db
+def test_extract_uid(rf, dummy_app):
     request = rf.get("/")
-    provider = CustomSalesforceProvider(request)
+    provider = CustomSalesforceProvider(request, dummy_app)
     result = provider.extract_uid({"organization_id": "ORG", "user_id": "USER"})
     assert result == "ORG/USER"
diff --git a/metecho/oauth2/views.py b/metecho/oauth2/views.py
index 6aaf03949..f671cae5f 100644
--- a/metecho/oauth2/views.py
+++ b/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,