Merge remote-tracking branch 'upstream/main'

AlvaroMartinMunoz · Oct 16, 2024 · ec61c5f · ec61c5f
2 parents bc3f57c + eccf7b2
commit ec61c5f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/app/modules/dataset/tests/test_selenium.py b/app/modules/dataset/tests/test_selenium.py
@@ -1,3 +1,4 @@
+import os
 import time
 
 from selenium.webdriver.common.by import By
@@ -80,13 +81,18 @@ def test_upload_dataset():
         affiliation_field1 = driver.find_element(By.NAME, "authors-1-affiliation")
         affiliation_field1.send_keys("Club1")
 
-        # Upload two files
+        # Obtén las rutas absolutas de los archivos
+        file1_path = os.path.abspath("app/modules/dataset/uvl_examples/file1.uvl")
+        file2_path = os.path.abspath("app/modules/dataset/uvl_examples/file2.uvl")
+
+        # Subir el primer archivo
         dropzone = driver.find_element(By.CLASS_NAME, "dz-hidden-input")
-        dropzone.send_keys("/tmp/FileSystem.uvl")
+        dropzone.send_keys(file1_path)
         wait_for_page_to_load(driver)
 
+        # Subir el segundo archivo
         dropzone = driver.find_element(By.CLASS_NAME, "dz-hidden-input")
-        dropzone.send_keys("/tmp/FileSystem.uvl")
+        dropzone.send_keys(file2_path)
         wait_for_page_to_load(driver)
 
         # Add authors in UVL models

diff --git a/docker/images/Dockerfile.dev b/docker/images/Dockerfile.dev
@@ -35,10 +35,10 @@ RUN find . -type d -name "__pycache__" -exec rm -r {} + && \
     find . -type f -name "*.pyc" -exec rm -f {} +
 
 # Copy the wait-for-db.sh script and set execution permissions
-COPY --chmod=+x scripts/wait-for-db.sh ./scripts/
+COPY --chmod=0755 scripts/wait-for-db.sh ./scripts/
 
 # Copy the init-testing-db.sh script and set execution permissions
-COPY --chmod=+x scripts/init-testing-db.sh ./scripts/
+COPY --chmod=0755 scripts/init-testing-db.sh ./scripts/
 
 # Copy files
 COPY rosemary/ ./rosemary

diff --git a/docker/images/Dockerfile.prod b/docker/images/Dockerfile.prod
@@ -30,7 +30,7 @@ RUN find . -type d -name "__pycache__" -exec rm -r {} + && \
     find . -type f -name "*.pyc" -exec rm -f {} +
 
 # Copy the wait-for-db.sh script and set execution permissions
-COPY --chmod=+x scripts/wait-for-db.sh ./scripts/
+COPY --chmod=0755 scripts/wait-for-db.sh ./scripts/
 
 # Update pip
 RUN pip install --no-cache-dir --upgrade pip

diff --git a/docker/images/Dockerfile.webhook b/docker/images/Dockerfile.webhook
@@ -32,13 +32,13 @@ WORKDIR /app
 COPY requirements.txt .
 
 # Copy the wait-for-db.sh script and set execution permissions
-COPY --chmod=+x scripts/wait-for-db.sh ./scripts/
+COPY --chmod=0755 scripts/wait-for-db.sh ./scripts/
 
 # Copy the git_update.sh script and set execution permissions
-COPY --chmod=+x scripts/git_update.sh ./scripts/
+COPY --chmod=0755 scripts/git_update.sh ./scripts/
 
 # Copy the restart_container.sh script and set execution permissions
-COPY --chmod=+x scripts/restart_container.sh ./scripts/
+COPY --chmod=0755 scripts/restart_container.sh ./scripts/
 
 # Update pip
 RUN pip install --no-cache-dir --upgrade pip