Merge pull request #201 from supertokens/ci/fix-django2x-frontend-integration

ci: Fix failing unit and django2x frontend integration tests

Author: rishabhpoddar

.circleci/config_continue.yml

@@ -68,7 +68,7 @@ jobs:
       - run: update-alternatives --install "/usr/bin/java" "java" "/usr/java/jdk-15.0.1/bin/java" 2
       - run: update-alternatives --install "/usr/bin/javac" "javac" "/usr/java/jdk-15.0.1/bin/javac" 2
       - run: echo "127.0.0.1 localhost.org" >> /etc/hosts
-      - run: make with-django
+      - run: make with-django2x
       - run: (cd .circleci/ && ./websiteDjango2x.sh)
       - slack/status
   test-authreact-fastapi:

Makefile

@@ -34,6 +34,9 @@ with-fastapi:
 with-django:
 	pip3 install -e .[django]
 
+with-django2x:
+	pip3 install -e .[django2x]
+
 with-flask:
 	pip3 install -e .[flask]
 

setup.py

@@ -31,12 +31,20 @@
     "django": (
         [
             "django-cors-headers==3.11.0",
-            "django",
+            "django==3",
             "django-stubs==1.9.0",
             "uvicorn==0.18.2",
             "python-dotenv==0.19.2",
         ]
     ),
+    "django2x": (
+        [
+            "django-cors-headers==2.0",
+            "django==2",
+            "django-stubs==1.9.0",
+            "python-dotenv==0.19.2",
+        ]
+    ),
 }
 
 exclude_list = [

tests/supertokens_python/test_supertokens_functions.py

@@ -20,9 +20,11 @@
 from supertokens_python import InputAppInfo, SupertokensConfig
 from supertokens_python import asyncio as st_asyncio
 from supertokens_python import init
+from supertokens_python.querier import Querier
 from supertokens_python.recipe import emailpassword, session
 from supertokens_python.recipe.emailpassword import asyncio as ep_asyncio
 from supertokens_python.recipe.emailpassword.interfaces import SignUpOkResult
+from supertokens_python.utils import is_version_gte
 
 
 def setup_function(_):
@@ -71,6 +73,11 @@ async def test_supertokens_functions():
     emails_desc = [user.email for user in users_desc]
     assert emails_desc == emails[::-1]
 
+    version = await Querier.get_instance().get_api_version()
+    if not is_version_gte(version, "2.10"):
+        # If the version is less than 2.10, delete user feature doesn't exist, so mark the test successful
+        return
+
     # Delete the 2nd user (bar@example.com)
     await st_asyncio.delete_user(user_ids[1])