Merge branch 'newJota' into newDevelop

Arquisoft · Apr 30, 2024 · f0725e0 · f0725e0
2 parents b18cc22 + 8bf9540
commit f0725e0
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 135 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,8 +6,10 @@ on:
       - develop
       - newDevelop
       - LaraFMz
-      - Pablo-AjustesFinales
       - jota
+      - newJota
+      - Pablo-Arreglos
+      - Pablo-AjustesFinales
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,28 +27,28 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-#  e2e-tests:
-#    needs: [unit-tests]
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: actions/setup-node@v4
-#      with:
-#        node-version: 20
-#    - run: npm --prefix userservice/authservice install
-#    - run: npm --prefix userservice/userservice install
-#    - run: npm --prefix gatewayservice install
-#    - run: npm --prefix questionservice install
-#    - run: npm --prefix webapp install
-#    - run: npm --prefix webapp run build
-#    - run: npm --prefix webapp run test:e2e
+  e2e-tests:
+    needs: [unit-tests]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20
+    - run: npm --prefix userservice/authservice install
+    - run: npm --prefix userservice/userservice install
+    - run: npm --prefix gatewayservice install
+    - run: npm --prefix questionservice install
+    - run: npm --prefix webapp install
+    - run: npm --prefix webapp run build
+    - run: npm --prefix webapp run test:e2e
   docker-push-webapp:
     name: Push webapp Docker Image to GitHub Packages
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-#    needs: [e2e-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -68,7 +68,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-#    needs: [e2e-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -85,7 +85,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-#    needs: [e2e-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -102,7 +102,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-#    needs: [e2e-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Update OpenAPI configuration
@@ -123,7 +123,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-#    needs: [e2e-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -140,7 +140,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-#    needs: [ e2e-tests ]
+    needs: [ e2e-tests ]
     steps:
       - uses: actions/checkout@v4
       - name: Publish to Registry
@@ -161,7 +161,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-#    needs: [ e2e-tests ]
+    needs: [ e2e-tests ]
     steps:
       - uses: actions/checkout@v4
       - name: Publish to Registry

diff --git a/webapp/e2e/jest.config.js b/webapp/e2e/jest.config.js
@@ -1,5 +1,5 @@
 module.exports = {
     testMatch: ["**/steps/*.js"],
-    testTimeout: 30000,
+    testTimeout: 200000,
     setupFilesAfterEnv: ["expect-puppeteer"]
 }
diff --git a/webapp/e2e/steps/01-register-form.steps.js b/webapp/e2e/steps/01-register-form.steps.js
@@ -14,7 +14,7 @@ defineFeature(feature, test => {
       : await puppeteer.launch({ headless: false, slowMo: 100 });
     page = await browser.newPage();
     //Way of setting up the timeout
-    setDefaultOptions({ timeout: 10000 })
+    setDefaultOptions({ timeout: 200000 })
 
     await page
       .goto("http://localhost:3000", {

diff --git a/webapp/e2e/steps/02-login.steps.js b/webapp/e2e/steps/02-login.steps.js
diff --git a/webapp/e2e/steps/03-home.steps.js b/webapp/e2e/steps/03-home.steps.js
diff --git a/webapp/package.json b/webapp/package.json
@@ -29,7 +29,7 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "CI=false && react-scripts build",
     "prod": "serve -s build",
     "test": "react-scripts test --transformIgnorePatterns 'node_modules/(?!axios)/'",
     "test:e2e": "start-server-and-test 'node e2e/test-environment-setup.js' http://localhost:8000/health prod 3000 \"cd e2e && jest\"",