From b062cec747e9a65d0c23e0674d4c4e6130381251 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 29 Jun 2023 15:01:24 +0200 Subject: [PATCH] refs #5475 fix setPassword options/cb --- e2e/helpers/puppeteer.js | 2 +- .../14-account/02_alias_create_and_basic_data.spec.js | 2 +- loopback/locale/en.json | 7 ++++--- modules/account/back/methods/account/set-password.js | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/e2e/helpers/puppeteer.js b/e2e/helpers/puppeteer.js index bd20346a3..ac4f6cc02 100644 --- a/e2e/helpers/puppeteer.js +++ b/e2e/helpers/puppeteer.js @@ -28,7 +28,7 @@ export async function getBrowser() { args, defaultViewport: null, headless: headless, - slowMo: 20, // slow down by ms + slowMo: 1, // slow down by ms // ignoreDefaultArgs: ['--disable-extensions'], // executablePath: '/usr/bin/google-chrome-stable', // executablePath: '/usr/bin/firefox-developer-edition', diff --git a/e2e/paths/14-account/02_alias_create_and_basic_data.spec.js b/e2e/paths/14-account/02_alias_create_and_basic_data.spec.js index 78a17d353..dd35dd740 100644 --- a/e2e/paths/14-account/02_alias_create_and_basic_data.spec.js +++ b/e2e/paths/14-account/02_alias_create_and_basic_data.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -fdescribe('Account Alias create and basic data path', () => { +describe('Account Alias create and basic data path', () => { let browser; let page; diff --git a/loopback/locale/en.json b/loopback/locale/en.json index 40df9a712..09069bc5e 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -175,6 +175,7 @@ "Pass expired": "The password has expired, change it from Salix", "Can't transfer claimed sales": "Can't transfer claimed sales", "Invalid quantity": "Invalid quantity", - "Failed to upload delivery note": "Error to upload delivery note {{id}}", - "Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address" -} + "Failed to upload delivery note": "Error to upload delivery note {{id}}", + "Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address", + "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 3": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 3" +} \ No newline at end of file diff --git a/modules/account/back/methods/account/set-password.js b/modules/account/back/methods/account/set-password.js index f6c820af9..c4d627cf0 100644 --- a/modules/account/back/methods/account/set-password.js +++ b/modules/account/back/methods/account/set-password.js @@ -22,6 +22,7 @@ module.exports = Self => { }); Self.setPassword = async function(id, newPassword, options) { + options = typeof options == 'object' ? options : {}; await Self.app.models.VnUser.setPassword(id, newPassword, options); }; };