Remove useless environment variable

Allow all tests again Fix wrong model import in migration Formatter
intuitem · Dec 4, 2024 · 20134ac · 20134ac
1 parent ea8e76a
commit 20134ac
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 17 deletions.
diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml
@@ -70,7 +70,6 @@ jobs:
         run: |
           touch .env
           echo PUBLIC_BACKEND_API_URL=http://localhost:8000/api >> .env
-          echo CI_TEST=1 >> .env
       - name: Create backend environment variables file
         working-directory: ${{ env.backend-directory }}
         run: |
@@ -175,7 +174,6 @@ jobs:
         run: |
           touch .env
           echo PUBLIC_BACKEND_API_URL=http://localhost:8000/api >> .env
-          echo CI_TEST=1 >> .env
       - name: Create backend environment variables file
         working-directory: ${{ env.backend-directory }}
         run: |
@@ -211,7 +209,7 @@ jobs:
           nohup poetry run python manage.py runserver --settings=${{ env.enterprise-backend-settings-module }} &
       - name: Run tests with browser ${{ matrix.playwright-browser }}
         working-directory: ${{ env.enterprise-frontend-build-directory }}
-        run: pnpm exec playwright test --project=${{ matrix.playwright-browser }} -g "user can set his password"
+        run: pnpm exec playwright test --project=${{ matrix.playwright-browser }}
         env:
           CI: true
       - uses: actions/upload-artifact@v4

diff --git a/.github/workflows/startup-tests.yml b/.github/workflows/startup-tests.yml
@@ -63,7 +63,6 @@ jobs:
         run: |
           touch .env
           echo PUBLIC_BACKEND_API_URL=http://localhost:8000/api >> .env
-          echo CI_TEST=1 >> .env
       - name: Create backend environment variables file
         working-directory: ${{ env.backend-directory }}
         run: |
@@ -199,7 +198,6 @@ jobs:
         run: |
           touch .env
           echo PUBLIC_BACKEND_API_URL=http://localhost:8000/api >> .env
-          echo CI_TEST=1 >> .env
       - name: Create backend environment variables file
         working-directory: ${{ env.backend-directory }}
         run: |

diff --git a/...10_create_allauth_emailaddress_objects.py → ...09_create_allauth_emailaddress_objects.py b/...10_create_allauth_emailaddress_objects.py → ...09_create_allauth_emailaddress_objects.py
@@ -5,8 +5,8 @@
 
 def create_emailaddress_objects(apps, schema_editor):
     try:
-        from allauth.account.models import EmailAddress
-        from iam.models import User
+        EmailAddress = apps.get_model("account", "EmailAddress")
+        User = apps.get_model("iam", "User")
 
         for user in User.objects.all():
             EmailAddress.objects.create(
@@ -21,7 +21,7 @@ def create_emailaddress_objects(apps, schema_editor):
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("iam", "0009_user_preferences"),
+        ("iam", "0008_user_is_third_party"),
     ]
 
     operations = [

diff --git a/...d/iam/migrations/0009_user_preferences.py → ...d/iam/migrations/0010_user_preferences.py b/...d/iam/migrations/0009_user_preferences.py → ...d/iam/migrations/0010_user_preferences.py
@@ -1,11 +1,11 @@
-# Generated by Django 5.1.1 on 2024-11-22 01:25
+# Generated by Django 5.1.1 on 2024-12-04 10:42
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("iam", "0008_user_is_third_party"),
+        ("iam", "0009_create_allauth_emailaddress_objects"),
     ]
 
     operations = [

diff --git a/frontend/src/lib/utils/env_constants.ts b/frontend/src/lib/utils/env_constants.ts
diff --git a/frontend/src/routes/(authentication)/login/+page.server.ts b/frontend/src/routes/(authentication)/login/+page.server.ts
@@ -1,8 +1,6 @@
 import { getSecureRedirect } from '$lib/utils/helpers';
 
 import { ALLAUTH_API_URL, BASE_API_URL } from '$lib/utils/constants';
-// The CI_TEST environment variable will have to be removed if the `currentLang == preferedLang` solution fix the enterprise function tests.
-// import { CI_TEST } from '$lib/utils/env_constants';
 import { loginSchema } from '$lib/utils/schemas';
 import type { LoginRequestBody } from '$lib/utils/types';
 import { fail, redirect, type Actions } from '@sveltejs/kit';