Revert "⬆️ Update e2e packages (#3762)" (#3776)

This reverts commit afb340f.
ITISFoundation · Jan 19, 2023 · 7318d34 · 7318d34
1 parent 398dd9e
commit 7318d34
Show file tree

Hide file tree

Showing 8 changed files with 7,636 additions and 7,212 deletions.
diff --git a/tests/e2e/custom-jest-setup.ts b/tests/e2e/custom-jest-setup.ts
diff --git a/tests/e2e/jest.config.js b/tests/e2e/jest.config.js
@@ -1,9 +1,11 @@
-const config = {
+module.exports = {
   preset: "jest-puppeteer",
   verbose: true,
   collectCoverage: true,
   coverageReporters: ["lcov", "text"],
-  setupFiles: ['<rootDir>/custom-jest-setup.ts'],
-};
-
-module.exports = config;
+  globals: {
+    url: "http://127.0.0.1:9081/",
+    apiVersion: 'v0/',
+    ourTimeout: 40000,
+  }
+}
diff --git a/tests/e2e/package-lock.json b/tests/e2e/package-lock.json
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -7,12 +7,12 @@
     "test": "tests"
   },
   "dependencies": {
-    "jest": "^29.3.1",
-    "jest-puppeteer": "^6.2.0",
+    "jest": "^24.9.0",
+    "jest-puppeteer": "^4.4.0",
     "log-timestamp": "^0.3.0",
-    "log4js": "^6.7.1",
-    "node-fetch": "^3.3.0",
-    "puppeteer": "^19.5.2"
+    "log4js": "^6.4.0",
+    "node-fetch": "^2.6.1",
+    "puppeteer": "^2.1.1"
   },
   "scripts": {
     "test": "jest --debug --runInBand --colors",

diff --git a/tests/e2e/s4l/sim4life-lite.js b/tests/e2e/s4l/sim4life-lite.js
@@ -1,13 +1,4 @@
-// node sim4life-lite.js url
-// [--user user]
-// [--pass pass]
-// [--n_users nUsers]
-// [--user_prefix userPrefix]
-// [--user_suffix userSuffix]
-// [--start_timeout startTimeout]
-// [--basicauth_user basicauthUsername]
-// [--basicauth_pass basicauthPassword]
-// [--demo]
+// node sim4life-lite.js [url] [user] [password] [timeout] [--demo]
 
 const utils = require('../utils/utils');
 const tutorialBase = require('../tutorials/tutorialBase');

diff --git a/tests/e2e/tests/register.test.js b/tests/e2e/tests/register.test.js
@@ -67,5 +67,5 @@ test('Register and Log Out', async () => {
   await auto.register(page, user, pass);
   page.on('response', secondHandler);
   await auto.logOut(page);
-  await utils.sleep(5000);
+  await page.waitFor(5000);
 }, ourTimeout);
diff --git a/tests/e2e/tests/startupCalls.test.js b/tests/e2e/tests/startupCalls.test.js
@@ -10,7 +10,7 @@ describe('Calls after logging in', () => {
   beforeAll(async () => {
     await page.goto(url);
     await auto.register(page, user, pass);
-    await utils.sleep(1000);
+    await page.waitFor(1000);
   }, ourTimeout);
 
   afterAll(async () => {

diff --git a/tests/e2e/utils/auto.js b/tests/e2e/utils/auto.js
@@ -128,9 +128,9 @@ async function dashboardOpenFirstTemplate(page, templateName) {
   if (templateName) {
     // Show flat list
     await utils.waitAndClick(page, '[osparc-test-id="groupByButton"]', 1000);
+    await utils.sleep(1000);
     await utils.waitAndClick(page, '[osparc-test-id="groupByNone"]', 1000);
-
-    await utils.sleep(2000);
+    await utils.sleep(1000);
 
     await utils.takeScreenshot(page, "type filter text");
     await __filterTemplatesByText(page, templateName);