diff --git a/db/dump/fixtures.after.sql b/db/dump/fixtures.after.sql index fe05414da..f0741e78b 100644 --- a/db/dump/fixtures.after.sql +++ b/db/dump/fixtures.after.sql @@ -316,7 +316,7 @@ INSERT INTO mysql.roles_mapping (`User`, `Host`, `Role`, `Admin_option`) WHERE `User` LIKE @prefixedLike AND `Host` = @genRoleHost; -- Actualiza los valores de la nueva columna con los valores correspondientes de la tabla userInfo -UPDATE `account`.`user` as `user` +UPDATE `account`.`user` as `user` JOIN vn.client `client` ON `user`.id = `client`.id SET `user`.recoveryPhone = `client`.phone; diff --git a/db/versions/10958-orangeDendro/01-updateUserPhoneColumn.vn.sql b/db/versions/10958-orangeDendro/01-updateUserPhoneColumn.vn.sql index 390d6c4c1..3d908ecff 100644 --- a/db/versions/10958-orangeDendro/01-updateUserPhoneColumn.vn.sql +++ b/db/versions/10958-orangeDendro/01-updateUserPhoneColumn.vn.sql @@ -1,5 +1,5 @@ -- Actualiza los valores de la nueva columna con los valores correspondientes de la tabla userInfo -UPDATE `account`.`user` as `user` +UPDATE `account`.`user` as `user` JOIN vn.client `client` ON `user`.id = `client`.id SET `user`.recoveryPhone = `client`.phone; diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index af8f05581..758f420c5 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -37,7 +37,6 @@ export default { sendEmailButton: 'vn-recover-password vn-submit', smsOption: 'vn-recover-password vn-radio[val="sms"]', emailOption: 'vn-recover-password vn-radio[val="email"]', - }, accountIndex: { addAccount: 'vn-user-index button vn-icon[icon="add"]', diff --git a/e2e/paths/01-salix/04_recoverPassword.spec.js b/e2e/paths/01-salix/04_recoverPassword.spec.js index edde847e1..007cbecd3 100644 --- a/e2e/paths/01-salix/04_recoverPassword.spec.js +++ b/e2e/paths/01-salix/04_recoverPassword.spec.js @@ -8,7 +8,6 @@ describe('RecoverPassword path', async() => { beforeAll(async() => { browser = await getBrowser(); page = browser.page; - await page.setRequestInterception(true); }); beforeEach(async() => { @@ -65,6 +64,8 @@ describe('RecoverPassword path', async() => { }); it('should send sms using username', async() => { + await page.setRequestInterception(true); + await page.write(selectors.recoverPassword.email, 'BruceWayne'); await page.waitToClick(selectors.recoverPassword.smsOption); page.on('request', request => { diff --git a/e2e/tests.js b/e2e/tests.js index 2916eb1ee..829056f4c 100644 --- a/e2e/tests.js +++ b/e2e/tests.js @@ -23,8 +23,8 @@ async function test() { const opts = getopts(process.argv.slice(2), { boolean: ['show'] }); - // if (opts.show) - process.env.E2E_SHOW = true; + if (opts.show) + process.env.E2E_SHOW = true; console.log('Building and running DB container.'); const myt = new Myt(); @@ -37,6 +37,19 @@ async function test() { const specFiles = [ `./e2e/paths/01*/*[sS]pec.js`, + `./e2e/paths/02*/*[sS]pec.js`, + `./e2e/paths/03*/*[sS]pec.js`, + `./e2e/paths/04*/*[sS]pec.js`, + `./e2e/paths/05*/*[sS]pec.js`, + `./e2e/paths/06*/*[sS]pec.js`, + `./e2e/paths/07*/*[sS]pec.js`, + `./e2e/paths/08*/*[sS]pec.js`, + `./e2e/paths/09*/*[sS]pec.js`, + `./e2e/paths/10*/*[sS]pec.js`, + `./e2e/paths/11*/*[sS]pec.js`, + `./e2e/paths/12*/*[sS]pec.js`, + `./e2e/paths/13*/*[sS]pec.js`, + `./e2e/paths/**/*[sS]pec.js` ]; jasmine.loadConfig({ diff --git a/front/salix/components/recover-password/index.html b/front/salix/components/recover-password/index.html index ff7c8d4fb..25b4aabd7 100644 --- a/front/salix/components/recover-password/index.html +++ b/front/salix/components/recover-password/index.html @@ -36,7 +36,7 @@ We will sent you a sms to recover your password - + We will sent you an email to recover your password diff --git a/front/salix/components/recover-password/locale/en.yml b/front/salix/components/recover-password/locale/en.yml deleted file mode 100644 index eaa98cf80..000000000 --- a/front/salix/components/recover-password/locale/en.yml +++ /dev/null @@ -1,2 +0,0 @@ - -We will sent you a item to recover your password: We will sent you a {{mode}} to recover your password diff --git a/front/salix/components/recover-password/locale/es.yml b/front/salix/components/recover-password/locale/es.yml index cb5e04973..e8d1b4d57 100644 --- a/front/salix/components/recover-password/locale/es.yml +++ b/front/salix/components/recover-password/locale/es.yml @@ -1,7 +1,6 @@ Recover password: Recuperar contraseña We will sent you an email to recover your password: Te enviaremos un correo para restablecer tu contraseña We will sent you a sms to recover your password: Te enviaremos un sms para restablecer tu contraseña -We will sent you a item to recover your password: Te enviaremos un {{mode}} para restablecer tu contraseña Notification sent!: ¡Notificación enviada! User or recovery email: Usuario User's phone: Móvil del usuario diff --git a/modules/account/front/basic-data/index.html b/modules/account/front/basic-data/index.html index 7cd3dbf51..605f915cc 100644 --- a/modules/account/front/basic-data/index.html +++ b/modules/account/front/basic-data/index.html @@ -32,7 +32,6 @@ label="Recovery phone" ng-model="$ctrl.user.recoveryPhone" disabled="$root.user.id !== $ctrl.user.id" - >