Merge pull request #149 from Arquisoft/dev

Dev
Arquisoft · May 6, 2024 · 8a851bc · 8a851bc
2 parents c91f727 + 50c3abb
commit 8a851bc
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 110 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,27 +25,32 @@ 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 users/authservice install
-  #   - run: npm --prefix users/userservice install
-  #   - run: npm --prefix gatewayservice 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 users/authservice install
+    - run: npm --prefix users/userservice install
+    - run: npm --prefix gatewayservice install
+    - run: npm --prefix game/gameservice install
+    - run: npm --prefix game/groupservice install
+    - run: npm --prefix game/qgservice install
+    - run: npm --prefix multiplayerservice 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: [unit-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -69,7 +74,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [unit-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -87,7 +92,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [unit-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -105,7 +110,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [unit-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -123,7 +128,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [unit-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -141,7 +146,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [unit-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -162,7 +167,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [unit-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -180,7 +185,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [unit-tests]
+    needs: [e2e-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry

diff --git a/webapp/e2e/features/register-form.feature b/webapp/e2e/features/register-form.feature
@@ -3,4 +3,4 @@ Feature: Registering a new user
 Scenario: The user is not registered in the site
   Given An unregistered user
   When I fill the data in the form and press submit
-  Then A confirmation message should be shown in the screen
+  Then Should be inside the game route
diff --git a/webapp/e2e/singlePlayer.js b/webapp/e2e/singlePlayer.js
diff --git a/webapp/e2e/steps/register-form.steps.js b/webapp/e2e/steps/register-form.steps.js
@@ -29,8 +29,8 @@ defineFeature(feature, test => {
     let password;
 
     given('An unregistered user', async () => {
-      username = "pablo"
-      password = "pabloasw"
+      username = "conoceryvenceruser"
+      password = "conoceryvencerpass"
       await page.waitFor('button')
       await page.click("button", {id: "registerButton"});
     });
@@ -41,11 +41,9 @@ defineFeature(feature, test => {
       await page.click('button', { text: 'Add User' }) 
     });
 
-   then('A confirmation message should be shown in the screen', async () => {
-      const confirmationMessage = await page.waitForSelector('div',"#successUserAdd");
-
-      const messageText = await page.evaluate(confirmationMessage => confirmationMessage.innerText, confirmationMessage);
-      expect(messageText).toContain('User added successfully');
+   then('Should be inside the game route', async () => {
+      await page.waitForSelector('div', '.game-container');
+      expect(page.url()).toContain('/game');
     });
   })
 

diff --git a/webapp/e2e/test-environment-setup.js b/webapp/e2e/test-environment-setup.js
@@ -1,19 +1,19 @@
 const { MongoMemoryServer } = require('mongodb-memory-server');
 
 
-let mongoserver;
-let userservice;
-let authservice;
-let gatewayservice;
 
 async function startServer() {
     console.log('Starting MongoDB memory server...');
-    mongoserver = await MongoMemoryServer.create();
+    const mongoserver = await MongoMemoryServer.create();
     const mongoUri = mongoserver.getUri();
     process.env.MONGODB_URI = mongoUri;
-    userservice = await require("../../users/userservice/user-service");
-    authservice = await require("../../users/authservice/auth-service");
-    gatewayservice = await require("../../gatewayservice/gateway-service");
+    require("../../users/userservice/user-service");
+    require("../../users/authservice/auth-service");
+    require("../../gatewayservice/gateway-service");
+    require("../../game/gameservice/gameservice");
+    require("../../game/groupservice/group-service");
+    require("../../game/qgservice/qg-service");
+    require("../../multiplayerservice/server")
   }
 
   startServer();
diff --git a/webapp/package.json b/webapp/package.json
@@ -32,7 +32,7 @@
     "build": "react-scripts build",
     "prod": "cross-env REACT_APP_API_ENDPOINT=http://localhost:8000 REACT_APP_MULTIPLAYER_ENDPOINT=http://localhost:8006 serve -s build -l 80",
     "test": "react-scripts test --silent --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\"",
+    "test:e2e": "start-server-and-test 'node e2e/test-environment-setup.js' http://localhost:8000/health prod 80 \"cd e2e && jest\"",
     "eject": "react-scripts eject",
     "test-only:e2e": "cd e2e && jest"
   },