diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties index e129b09c..df8fd1c2 100644 --- a/api/src/main/resources/application.properties +++ b/api/src/main/resources/application.properties @@ -11,8 +11,8 @@ springdoc.api-docs.path=/swagger/api-docs management.endpoints.web.exposure.include=prometheus management.endpoint.prometheus.enabled=true -server.port=8443 -server.ssl.key-alias=tomcat -server.ssl.key-store=/etc/letsencrypt/live/kiwiq.run.place/keystore.p12 -server.ssl.key-store-type=PKCS12 -server.ssl.key-store-password=${SSL_PASSWORD} \ No newline at end of file +#server.port=8443 +#server.ssl.key-alias=tomcat +#server.ssl.key-store=/etc/letsencrypt/live/kiwiq.run.place/keystore.p12 +#server.ssl.key-store-type=PKCS12 +#server.ssl.key-store-password=${SSL_PASSWORD} \ No newline at end of file diff --git a/webapp/e2e/steps/login_register_negative_blank_email_credentials.steps.js b/webapp/e2e/steps/login_register_negative_blank_email_credentials.steps.js index 1470f4b4..3814f182 100644 --- a/webapp/e2e/steps/login_register_negative_blank_email_credentials.steps.js +++ b/webapp/e2e/steps/login_register_negative_blank_email_credentials.steps.js @@ -10,7 +10,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/login_register_negative_blank_password_credentials.steps.js b/webapp/e2e/steps/login_register_negative_blank_password_credentials.steps.js index 64265b00..526c021c 100644 --- a/webapp/e2e/steps/login_register_negative_blank_password_credentials.steps.js +++ b/webapp/e2e/steps/login_register_negative_blank_password_credentials.steps.js @@ -1,5 +1,3 @@ -import { waitForPageToLoad } from '../e2e_utils/e2e_utils_timeout.js'; - const { defineFeature, loadFeature }=require('jest-cucumber'); const puppeteer = require('puppeteer'); const setDefaultOptions = require("expect-puppeteer").setDefaultOptions; @@ -9,14 +7,12 @@ let browser; defineFeature(feature, test => { - let username = "t.login.neg.blnk_psw" - let user; - let password; + let username = "t.login.neg.blnk_psw"; beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout @@ -33,7 +29,7 @@ defineFeature(feature, test => { given('A registered user in the root screen', async () => { - waitForPageToLoad(); + await new Promise(resolve => setTimeout(resolve, 5000)); // Waiting for page to fully load let header = await page.$eval("button[data-testid='Login']", (element) => { return element.innerHTML }) @@ -47,7 +43,7 @@ defineFeature(feature, test => { }); and('User enters in the log in screen', async() => { - waitForPageToLoad(); + await new Promise(resolve => setTimeout(resolve, 5000)); // Waiting for page to fully load let header = await page.$eval("h2", (element) => { return element.innerHTML }) @@ -57,8 +53,8 @@ defineFeature(feature, test => { }); and('User fills the form with his proper email but leaves the password in blank', async() => { - await expect(page).toFill("#user", user); - await expect(page).toFill("#password", password); + await expect(page).toFill("#user", username+"@test.com"); + await expect(page).toFill("#password", ""); }); and('User presses the log in button', async() => { @@ -66,7 +62,7 @@ defineFeature(feature, test => { }); then('Log in screen shows an informative error message and does not allow the user to log in', async() => { - waitForPageToLoad(); + await new Promise(resolve => setTimeout(resolve, 5000)); // Waiting for page to fully load let header = await page.$eval("div[class='chakra-alert__desc css-zzks76'", (element) => { return element.innerHTML }) diff --git a/webapp/e2e/steps/login_register_negative_incorrect_credentials.steps.js b/webapp/e2e/steps/login_register_negative_incorrect_credentials.steps.js index db6aea08..962bad69 100644 --- a/webapp/e2e/steps/login_register_negative_incorrect_credentials.steps.js +++ b/webapp/e2e/steps/login_register_negative_incorrect_credentials.steps.js @@ -16,7 +16,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/logout_positive_logged_user.steps.js b/webapp/e2e/steps/logout_positive_logged_user.steps.js index 7a5be3d7..fd6cc9db 100644 --- a/webapp/e2e/steps/logout_positive_logged_user.steps.js +++ b/webapp/e2e/steps/logout_positive_logged_user.steps.js @@ -13,7 +13,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/logout_positive_non_logged_user.steps.js b/webapp/e2e/steps/logout_positive_non_logged_user.steps.js index 5949c001..7b0d29f6 100644 --- a/webapp/e2e/steps/logout_positive_non_logged_user.steps.js +++ b/webapp/e2e/steps/logout_positive_non_logged_user.steps.js @@ -18,7 +18,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/playing_game_negative_non_logged_user.steps.js b/webapp/e2e/steps/playing_game_negative_non_logged_user.steps.js index 2310d88c..02fa571b 100644 --- a/webapp/e2e/steps/playing_game_negative_non_logged_user.steps.js +++ b/webapp/e2e/steps/playing_game_negative_non_logged_user.steps.js @@ -19,7 +19,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/register_negative_blank_password.steps.js b/webapp/e2e/steps/register_negative_blank_password.steps.js index 077cbcb0..a665118e 100644 --- a/webapp/e2e/steps/register_negative_blank_password.steps.js +++ b/webapp/e2e/steps/register_negative_blank_password.steps.js @@ -13,7 +13,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/register_negative_blank_repeated_password.steps.js b/webapp/e2e/steps/register_negative_blank_repeated_password.steps.js index b1fa64a1..61dd0b02 100644 --- a/webapp/e2e/steps/register_negative_blank_repeated_password.steps.js +++ b/webapp/e2e/steps/register_negative_blank_repeated_password.steps.js @@ -14,7 +14,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/register_negative_blank_username.steps.js b/webapp/e2e/steps/register_negative_blank_username.steps.js index 03a869e1..fc50429d 100644 --- a/webapp/e2e/steps/register_negative_blank_username.steps.js +++ b/webapp/e2e/steps/register_negative_blank_username.steps.js @@ -14,7 +14,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/register_negative_email_already_in_use_form.steps.js b/webapp/e2e/steps/register_negative_email_already_in_use_form.steps.js index ec1876f1..f1044748 100644 --- a/webapp/e2e/steps/register_negative_email_already_in_use_form.steps.js +++ b/webapp/e2e/steps/register_negative_email_already_in_use_form.steps.js @@ -15,7 +15,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/register_negative_username_already_in_use_form.steps.js b/webapp/e2e/steps/register_negative_username_already_in_use_form.steps.js index 21b213eb..11b0cd3a 100644 --- a/webapp/e2e/steps/register_negative_username_already_in_use_form.steps.js +++ b/webapp/e2e/steps/register_negative_username_already_in_use_form.steps.js @@ -15,7 +15,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/register_negative_wrong_email_format.steps.js b/webapp/e2e/steps/register_negative_wrong_email_format.steps.js index fd799f4e..7413296e 100644 --- a/webapp/e2e/steps/register_negative_wrong_email_format.steps.js +++ b/webapp/e2e/steps/register_negative_wrong_email_format.steps.js @@ -13,7 +13,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/seeing_rules_negative_non_logged_user.steps.js b/webapp/e2e/steps/seeing_rules_negative_non_logged_user.steps.js index 39d2d324..b7754271 100644 --- a/webapp/e2e/steps/seeing_rules_negative_non_logged_user.steps.js +++ b/webapp/e2e/steps/seeing_rules_negative_non_logged_user.steps.js @@ -19,7 +19,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/seeing_rules_positive.steps.js b/webapp/e2e/steps/seeing_rules_positive.steps.js index 96c501e0..f73ef6d3 100644 --- a/webapp/e2e/steps/seeing_rules_positive.steps.js +++ b/webapp/e2e/steps/seeing_rules_positive.steps.js @@ -18,7 +18,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/seeing_stats_negative_non_logged_user.steps.js b/webapp/e2e/steps/seeing_stats_negative_non_logged_user.steps.js index 1f0813a6..28c723c5 100644 --- a/webapp/e2e/steps/seeing_stats_negative_non_logged_user.steps.js +++ b/webapp/e2e/steps/seeing_stats_negative_non_logged_user.steps.js @@ -19,7 +19,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout diff --git a/webapp/e2e/steps/seeing_stats_positive.steps.js b/webapp/e2e/steps/seeing_stats_positive.steps.js index d9e6ba0c..75fe405e 100644 --- a/webapp/e2e/steps/seeing_stats_positive.steps.js +++ b/webapp/e2e/steps/seeing_stats_positive.steps.js @@ -19,7 +19,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS - ? await puppeteer.launch() + ? await puppeteer.launch({ ignoreHTTPSErrors: true }) : await puppeteer.launch({ headless: false, slowMo: 100, ignoreHTTPSErrors: true }); page = await browser.newPage(); //Way of setting up the timeout