Merge pull request #62 from pescaito-team/develop

feat(version): release 2.2.3
pescaito-team · Dec 17, 2024 · f60d8c2 · f60d8c2
2 parents e43aff8 + 0133a76
commit f60d8c2
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 37 deletions.
diff --git a/.github/workflows/release-with-changelog.yml b/.github/workflows/release-with-changelog.yml
@@ -1,25 +1,27 @@
 name: Release Workflow
 
 on:
-  pull_request:
-    types:
-      - closed
+  push:
     branches:
       - main
-
-permissions:
-  contents: write
+  workflow_dispatch:
 
 jobs:
   release:
-    if: >
-      github.event.pull_request.merged == true &&
-      contains(github.event.pull_request.title, 'release')
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
 
     steps:
       - name: Check out the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '20.8.1'
 
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -31,10 +33,22 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements.txt
 
-      - name: Install jq
-        run: sudo apt-get install -y jq
-
-      - name: Run semantic-release
+      - name: Create temporary package.json
+        run: |
+          echo '{
+            "private": true,
+            "devDependencies": {}
+          }' > package.json
+            
+      - name: Install semantic-release and plugins
+        run: |
+          npm install --save-dev semantic-release @semantic-release/git @semantic-release/changelog
+            
+      - name: Run Semantic Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: npx semantic-release
+
+      - name: Clean up temporary files
+        if: always()
+        run: rm package.json package-lock.json
diff --git a/app/modules/auth/tests/test_selenium_ide/test_signup.py b/app/modules/auth/tests/test_selenium_ide/test_signup.py
@@ -15,7 +15,7 @@ def teardown_method(self, method):
 
     def test_signup(self):
         self.driver.get(get_host_for_selenium_testing())
-        self.driver.find_element(By.LINK_TEXT, "Sign Up").click()
+        self.driver.find_element(By.LINK_TEXT, "Sign up").click()
         self.driver.find_element(By.ID, "email").send_keys("[email protected]")
         self.driver.find_element(By.ID, "password").send_keys("1234")
         self.driver.find_element(By.ID, "name").click()

diff --git a/app/modules/dataset/templates/dataset/list_datasets.html b/app/modules/dataset/templates/dataset/list_datasets.html
@@ -72,12 +72,6 @@ <h5 class="card-title mb-0">No datasets found</h5>
                         <div class="card-header">
                             <h5 class="card-title">Unsynchronized datasets</h5>
                         </div>
-
-                        <!-- Botón para seleccionar feature models y crear un nuevo dataset -->
-                        <div class="mt-3 mb-3">
-                            <a href="{{ url_for('dataset.select_models') }}" class="btn btn-success">Select Feature Models to Create Dataset</a>
-                        </div>
-
                         <div class="card-body">
                             <table class="table">
                                 <thead>
@@ -120,6 +114,9 @@ <h5 class="card-title">Unsynchronized datasets</h5>
                     </div>
                 </div>
             {% endif %}
+            <div class="mt-3 mb-3">
+                <a href="{{ url_for('dataset.select_models') }}" class="btn btn-success">Select Feature Models to Create Dataset</a>
+            </div>
         </div>
     </div>
 

diff --git a/app/modules/explore/tests/test_selenium.py b/app/modules/explore/tests/test_selenium.py
@@ -36,9 +36,9 @@ def test_filter_by_publication_type(self):
         dropdown = self.driver.find_element(By.ID, "publication_type")
         dropdown.find_element(By.XPATH, "//option[. = 'Data Management Plan']").click()
 
-        # Espera a que el elemento "Sample dataset 2" sea clickable
+        # Espera a que el elemento "Sample dataset 1" sea clickable
         element = WebDriverWait(self.driver, 10).until(
-            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 2"))
+            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 1"))
         )
 
         # Desplazar la vista hasta el elemento si es necesario
@@ -51,11 +51,11 @@ def test_filter_by_publication_type(self):
 
     def test_filter_by_author(self):
         dropdown = self.driver.find_element(By.ID, "authors")
-        dropdown.find_element(By.XPATH, "//option[. = 'Author 2']").click()
+        dropdown.find_element(By.XPATH, "//option[. = 'Author 1']").click()
 
-        # Espera a que el elemento "Sample dataset 2" sea clickable
+        # Espera a que el elemento "Sample dataset 1" sea clickable
         element = WebDriverWait(self.driver, 10).until(
-            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 2"))
+            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 1"))
         )
 
         # Desplazar la vista hasta el elemento si es necesario
@@ -68,11 +68,11 @@ def test_filter_by_author(self):
 
     def test_filter_by_files(self):
         dropdown = self.driver.find_element(By.ID, "files")
-        dropdown.find_element(By.XPATH, "//option[. = '1 File']").click()
+        dropdown.find_element(By.XPATH, "//option[. = '3 Files']").click()
 
-        # Espera a que el elemento "Sample dataset 2" sea clickable
+        # Espera a que el elemento "Sample dataset 1" sea clickable
         element = WebDriverWait(self.driver, 10).until(
-            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 2"))
+            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 1"))
         )
 
         # Desplazar la vista hasta el elemento si es necesario
@@ -85,11 +85,11 @@ def test_filter_by_files(self):
 
     def test_filter_by_size(self):
         dropdown = self.driver.find_element(By.ID, "size")
-        dropdown.find_element(By.XPATH, "//option[. = 'Less than 1KB']").click()
+        dropdown.find_element(By.XPATH, "//option[. = 'Between 1KB and 2KB']").click()
 
-        # Espera a que el elemento "Sample dataset 2" sea clickable
+        # Espera a que el elemento "Sample dataset 1" sea clickable
         element = WebDriverWait(self.driver, 10).until(
-            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 2"))
+            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 1"))
         )
 
         # Desplazar la vista hasta el elemento si es necesario
@@ -102,11 +102,11 @@ def test_filter_by_size(self):
 
     def test_filter_by_title(self):
         dropdown = self.driver.find_element(By.ID, "title")
-        dropdown.find_element(By.XPATH, "//option[. = 'Sample dataset 2']").click()
+        dropdown.find_element(By.XPATH, "//option[. = 'Sample dataset 1']").click()
 
-        # Espera a que el elemento "Sample dataset 2" sea clickable
+        # Espera a que el elemento "Sample dataset 1" sea clickable
         element = WebDriverWait(self.driver, 10).until(
-            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 2"))
+            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 1"))
         )
 
         # Desplazar la vista hasta el elemento si es necesario
@@ -122,9 +122,9 @@ def test_filter_by_tag(self):
         dropdown = self.driver.find_element(By.ID, "tag")
         dropdown.find_element(By.XPATH, "//option[. = 'Any']").click()
 
-        # Espera a que el elemento "Sample dataset 2" sea clickable
+        # Espera a que el elemento "Sample dataset 1" sea clickable
         element = WebDriverWait(self.driver, 10).until(
-            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 2"))
+            EC.element_to_be_clickable((By.LINK_TEXT, "Sample dataset 1"))
         )
 
         # Desplazar la vista hasta el elemento si es necesario