Merge pull request #1070 from dandi/1065-failing-tests

dandi · Apr 29, 2022 · 3794e59 · 3794e59
2 parents 4a6e91d + 7d20685
commit 3794e59
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml
@@ -54,3 +54,4 @@ jobs:
           DJANGO_DANDI_WEB_APP_URL: http://localhost:8085
           DJANGO_DANDI_API_URL: http://localhost:8000
           DJANGO_DANDI_JUPYTERHUB_URL: https://hub.dandiarchive.org/
+          DANDI_ALLOW_LOCALHOST_URLS: 1
diff --git a/.github/workflows/frontend-ci.yml b/.github/workflows/frontend-ci.yml
@@ -74,6 +74,7 @@ jobs:
           DJANGO_DANDI_WEB_APP_URL: http://localhost:8085
           DJANGO_DANDI_API_URL: http://localhost:8000
           DJANGO_DANDI_JUPYTERHUB_URL: https://hub.dandiarchive.org/
+          DANDI_ALLOW_LOCALHOST_URLS: 1
 
   # TODO: Remove this job when the rest of the puppeteer-based tests are ported to pyppeteer
   test-e2e-jest-puppeteer:
@@ -110,6 +111,7 @@ jobs:
       DJANGO_DANDI_WEB_APP_URL: http://localhost:8085
       DJANGO_DANDI_API_URL: http://localhost:8000
       DJANGO_DANDI_JUPYTERHUB_URL: https://hub.dandiarchive.org/
+      DANDI_ALLOW_LOCALHOST_URLS: 1
 
       # Web client env vars
       VUE_APP_DANDI_API_ROOT: http://localhost:8000/api/

diff --git a/dandiapi/api/tests/factories.py b/dandiapi/api/tests/factories.py
@@ -35,7 +35,7 @@ class Meta:
         model = User
 
     username = factory.SelfAttribute('email')
-    email = factory.Faker('safe_email')
+    email = factory.Faker('free_email')
     first_name = factory.Faker('first_name')
     last_name = factory.Faker('last_name')
 

diff --git a/dev/.env.docker-compose b/dev/.env.docker-compose
@@ -11,3 +11,4 @@ DJANGO_DANDI_DANDISETS_EMBARGO_BUCKET_NAME=dandi-embargo-dandisets
 DJANGO_DANDI_WEB_APP_URL=http://localhost:8085
 DJANGO_DANDI_API_URL=http://localhost:8000
 DJANGO_DANDI_JUPYTERHUB_URL=https://hub.dandiarchive.org/
+DANDI_ALLOW_LOCALHOST_URLS=1
diff --git a/dev/.env.docker-compose-native b/dev/.env.docker-compose-native
@@ -10,3 +10,4 @@ DJANGO_DANDI_DANDISETS_EMBARGO_BUCKET_NAME=dandi-embargo-dandisets
 DJANGO_DANDI_WEB_APP_URL=http://localhost:8085
 DJANGO_DANDI_API_URL=http://localhost:8000
 DJANGO_DANDI_JUPYTERHUB_URL=https://hub.dandiarchive.org/
+DANDI_ALLOW_LOCALHOST_URLS=1
diff --git a/tox.ini b/tox.ini
@@ -49,6 +49,7 @@ passenv =
     DJANGO_DANDI_WEB_APP_URL
     DJANGO_DANDI_API_URL
     DJANGO_DANDI_JUPYTERHUB_URL
+    DANDI_ALLOW_LOCALHOST_URLS
 extras =
     dev
     test
@@ -84,6 +85,7 @@ passenv =
     DJANGO_DANDI_WEB_APP_URL
     DJANGO_DANDI_API_URL
     DJANGO_DANDI_JUPYTERHUB_URL
+    DANDI_ALLOW_LOCALHOST_URLS
     PYPPETEER_BROWSER_HEADLESS
 deps =
     factory-boy