Better code quality

Arquisoft · Apr 28, 2020 · 60838bf · 60838bf
1 parent 53cd4a8
commit 60838bf
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 123 deletions.
diff --git a/e2e/step-definitions/basicFunctionality.steps.js b/e2e/step-definitions/basicFunctionality.steps.js
@@ -4,16 +4,17 @@ const expect = require('expect-puppeteer');
 const puppeteer = require('puppeteer');
 
 jest.setTimeout(400000);
+let page = null;
+
 function delay(time) {
     return new Promise(function (resolve) {
-        setTimeout(resolve, time)
+        setTimeout(resolve, time);
     });
 }
-defineFeature(feature, test => {
+defineFeature(feature, (test) => {
 
     beforeEach(async () => {
         await delay(10000);
-        console.log("Before each");
         //Open browser
         const browser = await puppeteer.launch({
             //headless let watch the chrome window interacting with the application
@@ -22,7 +23,7 @@ defineFeature(feature, test => {
         });
         page = await browser.newPage();
         await page.goto('http://localhost:3000');
-    })
+    });
 
     test('Access the main view of the App', ({ given, when, then }) => {
 

diff --git a/e2e/step-definitions/groups.steps.js b/e2e/step-definitions/groups.steps.js
@@ -11,16 +11,16 @@ let page = null;
 
 function a(){
     //return "viadeen3atest123";
-    return Buffer.from("SXo5X1NlVjRfJA==", "base64").toString('utf-8')
+    return Buffer.from("SXo5X1NlVjRfJA==", "base64").toString('utf-8');
 }
 
 function delay(time) {
     return new Promise(function (resolve) {
-        setTimeout(resolve, time)
+        setTimeout(resolve, time);
     });
 }
 
-defineFeature(feature, test => {
+defineFeature(feature, (test) => {
 
     beforeEach(async () => {
         await delay(10000);
@@ -34,12 +34,11 @@ defineFeature(feature, test => {
         await page.goto('http://localhost:3000');
 
         // Login
-        console.log("Logging in...");
         await page.waitForSelector('button.btn-outline-light');
         await page.click('button.btn-outline-light');
 
         const [popup] = await Promise.all([
-            new Promise(resolve => page.once('popup', resolve)),
+            new Promise((resolve) => {page.once('popup', resolve);}),
         ]);
 
         await popup.waitForSelector('input[type="url"]');

diff --git a/e2e/step-definitions/login.steps.js b/e2e/step-definitions/login.steps.js
@@ -7,18 +7,19 @@ const puppeteer = require('puppeteer');
 jest.setTimeout(400000);
 let idp = "https://uo263624.solid.community";
 let account = "uo263624";
+let page = null;
 
 function a(){
-    return Buffer.from("SXo5X1NlVjRfJA==", "base64").toString('utf-8')
+    return Buffer.from("SXo5X1NlVjRfJA==", "base64").toString('utf-8');
 }
 
 function delay(time) {
     return new Promise(function (resolve) {
-        setTimeout(resolve, time)
+        setTimeout(resolve, time);
     });
 }
 
-defineFeature(feature, test => {
+defineFeature(feature, (test) => {
 
     beforeEach(async () => {
         await delay(10000);
@@ -30,7 +31,7 @@ defineFeature(feature, test => {
         });
         page = await browser.newPage();
         await page.goto('http://localhost:3000');
-    })
+    });
 
     test('Login to an account', ({ given, when, then }) => {
 
@@ -44,7 +45,7 @@ defineFeature(feature, test => {
             await page.click('button.btn-outline-light');
 
             const [popup] = await Promise.all([
-                new Promise(resolve => page.once('popup', resolve)),
+                new Promise((resolve) => {page.once('popup', resolve);}),
             ]);
 
             await popup.waitForSelector('input[type="url"]');

diff --git a/e2e/step-definitions/navigation.js b/e2e/step-definitions/navigation.js
@@ -10,16 +10,16 @@ let account = "uo263624";
 let page = null
 
 function a(){
-    return Buffer.from("SXo5X1NlVjRfJA==", "base64").toString('utf-8')
+    return Buffer.from("SXo5X1NlVjRfJA==", "base64").toString('utf-8');
 }
 
 function delay(time) {
     return new Promise(function (resolve) {
-        setTimeout(resolve, time)
+        setTimeout(resolve, time);
     });
 }
 
-defineFeature(feature, test => {
+defineFeature(feature, (test) => {
 
     beforeEach(async () => {
         delay(10000);
@@ -33,18 +33,11 @@ defineFeature(feature, test => {
         await page.goto('http://localhost:3000');
 
         // Login
-        await page.evaluate(async () => {
-            //let btns = [...document.querySelectorAll("button")];
-            //if (btns.length != 0 && btns.map(btn => btn.innerText).find(s => s.includes("Identifícate"))){
-
-            //}
-        });
-        console.log("Logging in...");
         await page.waitForSelector('button.btn-outline-light');
         await page.click('button.btn-outline-light');
 
         const [popup] = await Promise.all([
-            new Promise(resolve => page.once('popup', resolve)),
+            new Promise((resolve) => {page.once('popup', resolve);}),
         ]);
 
         await popup.waitForSelector('input[type="url"]');
@@ -75,8 +68,7 @@ defineFeature(feature, test => {
             await page.evaluate(() => {
                 let btns = [...document.querySelectorAll("a")];
                 btns.forEach(async function (btn) {
-                    if (btn.firstChild.innerText == "Gestión de rutas"){
-                        console.log("Clicked Gestión")
+                    if (btn.firstChild.innerText === "Gestión de rutas"){
                         btn.click();
                     }
                 });
@@ -103,8 +95,7 @@ defineFeature(feature, test => {
             await page.evaluate(() => {
                 let btns = [...document.querySelectorAll("a")];
                 btns.forEach(async function (btn) {
-                    if (btn.firstChild.innerText == "Gestión de rutas"){
-                        console.log("Clicked Gestión")
+                    if (btn.firstChild.innerText === "Gestión de rutas"){
                         btn.click();
                     }
                 });
@@ -129,8 +120,7 @@ defineFeature(feature, test => {
             await page.evaluate(() => {
                 let btns = [...document.querySelectorAll("a")];
                 btns.forEach(async function (btn) {
-                    if (btn.firstChild.innerText == "Gestión de rutas"){
-                        console.log("Clicked Gestión")
+                    if (btn.firstChild.innerText === "Gestión de rutas"){
                         btn.click();
                     }
                 });

diff --git a/e2e/step-definitions/routes.steps.js b/e2e/step-definitions/routes.steps.js
@@ -11,16 +11,16 @@ let page = null;
 
 function a(){
     //return "viadeen3atest123";
-    return Buffer.from("SXo5X1NlVjRfJA==", "base64").toString('utf-8')
+    return Buffer.from("SXo5X1NlVjRfJA==", "base64").toString('utf-8');
 }
 
 function delay(time) {
     return new Promise(function (resolve) {
-        setTimeout(resolve, time)
+        setTimeout(resolve, time);
     });
 }
 
-defineFeature(feature, test => {
+defineFeature(feature, (test) => {
 
     beforeEach(async () => {
         await delay(10000);
@@ -34,12 +34,11 @@ defineFeature(feature, test => {
         await page.goto('http://localhost:3000');
 
         // Login
-        console.log("Logging in...");
         await page.waitForSelector('button.btn-outline-light');
         await page.click('button.btn-outline-light');
 
         const [popup] = await Promise.all([
-            new Promise(resolve => page.once('popup', resolve)),
+            new Promise((resolve) => {page.once('popup', resolve);}),
         ]);
 
         await popup.waitForSelector('input[type="url"]');

diff --git a/e2e/support/actions.js b/e2e/support/actions.js
diff --git a/e2e/support/field.js b/e2e/support/field.js
diff --git a/e2e/support/pages.js b/e2e/support/pages.js
diff --git a/e2e/support/scope.js b/e2e/support/scope.js
diff --git a/e2e/support/selectors.js b/e2e/support/selectors.js