Merge remote-tracking branch 'origin/test/e2e' into test/e2e

Arquisoft · May 5, 2024 · 7eabc4b · 7eabc4b
2 parents 25a84d5 + b407a3c
commit 7eabc4b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/webapp/e2e/steps/about.steps.js b/webapp/e2e/steps/about.steps.js
@@ -9,8 +9,8 @@ defineFeature(feature, test => {
 
     beforeAll(async () => {
         browser = process.env.GITHUB_ACTIONS
-          ? await puppeteer.launch()
-          : await puppeteer.launch({ headless: false, slowMo: 100 });
+          ? await puppeteer.launch({ ignoreHTTPSErrors: true})
+          : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true });
         page = await browser.newPage();
         //Way of setting up the timeout
         setDefaultOptions({ timeout: 10000 })
@@ -24,7 +24,7 @@ defineFeature(feature, test => {
 
       test("A logged user wants to see the about screen of the webpage", ({given,when,and,then}) => {
 
-        let username = "test";
+        let username = "t.about";
 
         given("A logged user in the main menu", async () => {
             await registerUserFromRootDirectory(username,page)

diff --git a/webapp/e2e/steps/login_positive.steps.js b/webapp/e2e/steps/login_positive.steps.js
@@ -7,7 +7,7 @@ let browser;
 
 
 defineFeature(feature, test => {
-    let username = "t.regis.pos";
+    let username = "t.log.pos";
     let email = username + "@email.com";
     let password = username + "psw";
 
@@ -26,10 +26,10 @@ defineFeature(feature, test => {
           .catch(() => {});
 
          // Registering the user before the tests
-         await registerUserFromRootDirectory(username, page);
+          await registerUserFromRootDirectory(username, page);
 
           // Logging it out
-          await logOutUser(page)
+          await logOutUser(page);
 
       }, 120000);
 
@@ -113,6 +113,7 @@ async function registerUserFromRootDirectory(username, page) {
 async function logOutUser(page) {
     // Logging out
     await expect(page).toClick("#lateralMenuButton");
+    await new Promise(resolve => setTimeout(resolve, 5000)); // Waiting for page to fully load
     await expect(page).toClick("button[data-testid='LogOut']");
 
     // Checking for the log out to be sucessful