new:dev: cypress tests for top-up process

[github-actions[bot]]

✔️ translation is up-to-date

:x: code style needs update

It seems your code wasn't properly formatted using our current rules.

Please run src/App.vue 452ms src/assets/custom-variables.scss 40ms src/assets/datepicker.scss 3ms src/assets/fonts/roboto/style.css 25ms src/assets/main.scss 58ms src/assets/native.scss 3ms src/assets/switch-prefs.scss 10ms src/components/AboutModal.vue 67ms src/components/AuthChallenge.vue 56ms src/components/AuthChallengeDirect.vue 30ms src/components/AuthChallengePin.vue 45ms src/components/AuthChallengeRetention.vue 20ms src/components/AuthPref.vue 95ms src/components/AuthPrefDirect.vue 11ms src/components/AuthPrefPin.vue 73ms src/components/AuthPrefRetention.vue 11ms src/components/AuthPrefs.vue 34ms src/components/BankAccountItem.vue 51ms src/components/BiometryPrefs.vue 41ms src/components/ConfirmPaymentModal.vue 97ms src/components/CreateAccount.vue 115ms src/components/Dialog.vue 29ms src/components/LangPrefs.vue 32ms src/components/Modal.vue 17ms src/components/MoneyCreditModal.vue 71ms src/components/MoneyTransferModal.vue 179ms src/components/PasswordField.vue 26ms src/components/PendingTopUp.vue 41ms src/components/QrCodeModal.vue 32ms src/components/RecipientItem.vue 22ms src/components/ScanQrCode.vue 21ms src/components/TheBankAccountList.vue 119ms src/components/TheDashboardFooter.vue 53ms src/components/TheNavBar.vue 100ms src/components/TheTransactionList.vue 21ms src/components/TransactionItem.vue 21ms src/components/TransactionListModal.vue 197ms src/components/TransactionListRecent.vue 42ms src/exception.ts 11ms src/main.ts 57ms src/plugins/loading.ts 8ms src/plugins/vue-loading-overlay.d.ts 2ms src/polyfill.ts 4ms src/router/index.ts 16ms src/services/AuthService.ts 44ms src/services/Biometry.ts 11ms src/services/DatePicker.ts 10ms src/services/Dialog.ts 4ms src/services/ExportService.ts 8ms src/services/Gettext.ts 18ms src/services/lokapiService.ts 32ms src/services/PrefsService.ts 7ms src/services/QrCodeService.ts 21ms src/services/secret.ts 10ms src/services/toastService.ts 5ms src/services/UseBatchLoading.ts 10ms src/services/UseModal.ts 12ms src/shims-vue.d.ts 1ms src/store/index.ts 10ms src/store/lokapi.ts 32ms src/store/prefs.ts 3ms src/utils/fonts.ts 3ms src/utils/password.ts 4ms src/utils/vuex.ts 2ms src/views/admin/PendingAccounts.vue 65ms src/views/admin/PendingCredits.vue 80ms src/views/Carto.vue 8ms src/views/CreateMyAccount.vue 6ms src/views/Dashboard.vue 25ms src/views/Login.vue 60ms src/views/Prefs.vue 19ms src/views/ResetPassword.vue 39ms src/views/Signup.vue 99ms on your code before submitting the PR. You can amend this current PR.

19 files changed, 12 insertions(+), 55 deletions(-)

```diff diff --git a/src/App.vue b/src/App.vue index 56d1d38..8f8fb36 100644 --- a/src/App.vue +++ b/src/App.vue @@ -23,7 +23,6 @@ await StatusBar.setStyle({ style: Style.Light }) } CapacitorApp.addListener("backButton", ({ canGoBack }) => { - // XXXvlab: will need a back button service to insert these if (this.$qrCode.isActive()) return if (this.$modal.isActive.value) { this.$modal.back() diff --git a/src/components/AuthChallenge.vue b/src/components/AuthChallenge.vue index 38a8343..5557b3a 100644 --- a/src/components/AuthChallenge.vue +++ b/src/components/AuthChallenge.vue @@ -73,7 +73,6 @@ hide() { this.visible = false - // Destroys in memory previous challenge structure this.handler = false }, diff --git a/src/components/AuthChallengeRetention.vue b/src/components/AuthChallengeRetention.vue index 55b2f99..a8aecc5 100644 --- a/src/components/AuthChallengeRetention.vue +++ b/src/components/AuthChallengeRetention.vue @@ -36,14 +36,12 @@ }, async mounted() { this.subState = this.state - // Do we have some credential saved in store ? if (await this.handler.checkUserInput()) { if (this.state === "firstTry") { const lastCredsInput = await this.handler.inferKey() this.submitInput(lastCredsInput) return } - // Uh-oh, these weren't valid credentials this.handler.constructor.flush() this.subState = "firstTry" } diff --git a/src/components/AuthPref.vue b/src/components/AuthPref.vue index ac871de..f573313 100644 --- a/src/components/AuthPref.vue +++ b/src/components/AuthPref.vue @@ -102,13 +102,8 @@ } return true }, - /** - * Trigger direct default challenge an disable any retention - */ triggerDefaultChallenge() { return this.triggerChallenge(async (state: any, userAccount: any) => { - // By not asking the specific userAccount's auth, we remove - // any retention mecanism aspect. const accountAuthService = await this.$auth.getAccountAuth() return await accountAuthService.requestCredentials(state) }) @@ -128,7 +123,6 @@ setUseSimplifiedAuth(value: any) { this.useSimplifiedAuth = value this.$refs.checkbox.checked = value - // XXXvlab: nextTick didn't work. setTimeout(() => { this.$refs.checkbox.checked = value }, 0) @@ -136,12 +130,7 @@ async switchSimplifiedAuth(e: any) { e.preventDefault() if (this.useSimplifiedAuth) { - // Was on, switching off if (!(await this.triggerDefaultChallenge())) { - // XXXvlab: vuejs won't see any changes so won't force - // the checkbox to be unchecked. But it is automatically checked - // despite the preventDefault. - // this.useSimplifiedAuth = true this.setUseSimplifiedAuth(true) return } @@ -152,12 +141,7 @@ this.$forceUpdate() return } - // ``useSimplifiedAuth`` was off, switching on if (!(await this.triggerDefaultChallenge())) { - // XXXvlab: vuejs won't see any changes so won't force - // the checkbox to be unchecked. But it is automatically checked - // despite the preventDefault. - // this.useSimplifiedAuth = false this.setUseSimplifiedAuth(false) return } diff --git a/src/components/AuthPrefs.vue b/src/components/AuthPrefs.vue index fd7a48d..0659350 100644 --- a/src/components/AuthPrefs.vue +++ b/src/components/AuthPrefs.vue @@ -38,9 +38,6 @@ const $auth = this.$auth const moreThanOneUserAccount = userAccounts.length !== 1 - // XXXvlab: typeforcing to 'any' as typescript doesn't seem to - // understand that a 'allSettled' is actually a Promise of an - // array. const preparedTemplateDataPromises = (await Promise.allSettled( userAccounts.map(async (userAccount: any) => ({ name: diff --git a/src/components/BiometryPrefs.vue b/src/components/BiometryPrefs.vue index 730ae43..e5ab210 100644 --- a/src/components/BiometryPrefs.vue +++ b/src/components/BiometryPrefs.vue @@ -62,7 +62,6 @@ setUseBiometry(value: any) { this.setUserBiometry(value) this.useBiometry = value - // XXXvlab: nextTick didn't work. setTimeout(() => { this.$refs.biometryCheckbox.checked = value }, 0) diff --git a/src/components/ConfirmPaymentModal.vue b/src/components/ConfirmPaymentModal.vue index 9c200f1..2db4b22 100644 --- a/src/components/ConfirmPaymentModal.vue +++ b/src/components/ConfirmPaymentModal.vue @@ -181,8 +181,6 @@ }, methods: { async payTopUpRequest(): Promise { - // XXXvlab: we would need to launch regular checks - // here to acknowledge the payment window.open( this.$modal.args?.value[0].transaction.jsonData.odoo.order_url, "_blank" @@ -199,7 +197,6 @@ paymentStatus = await this.promiseWaitPayment } catch (err) { if (err === false) { - // The current modal was closed while waiting return } throw new UIError( @@ -211,13 +208,11 @@ } let modalName = this.$modal.modal.value if (modalName !== "ConfirmPaymentModal") { - // The modal was likely closed while waiting return } let myCurrentOrderId = this.$modal.args?.value[0].transaction.jsonData.odoo.order_id if (myCurrentOrderId !== orderId) { - // The modal was likely closed while waiting return } this.closeAndRefresh() @@ -232,7 +227,6 @@ let modalArgs = this.$modal.args?.value let modalName = this.$modal.modal.value if (modalName !== "ConfirmPaymentModal") { - // The modal was likely closed while waiting clearInterval(interval) reject(false) return @@ -240,7 +234,6 @@ let myCurrentOrderId = this.$modal.args?.value[0].transaction.jsonData.odoo.order_id if (myCurrentOrderId !== orderId) { - // The modal was likely closed while waiting clearInterval(interval) reject(false) return diff --git a/src/components/CreateAccount.vue b/src/components/CreateAccount.vue index ee47b44..b22a8a4 100644 --- a/src/components/CreateAccount.vue +++ b/src/components/CreateAccount.vue @@ -274,7 +274,7 @@ this.$gettext("Please try again or contact your administrator") ) - return // stay on page + return } this.$msg.warning(this.$gettext("Wallet already created")) } diff --git a/src/components/LangPrefs.vue b/src/components/LangPrefs.vue index 17a7b16..0e7cb3c 100644 --- a/src/components/LangPrefs.vue +++ b/src/components/LangPrefs.vue @@ -65,7 +65,6 @@ setUseCustomLanguage(value: any) { this.setCustomLanguage(value ? this.userLanguage : null) this.useCustomLanguage = value - // XXXvlab: nextTick didn't work. setTimeout(() => { this.$refs.langCheckbox.checked = value }, 0) diff --git a/src/components/MoneyCreditModal.vue b/src/components/MoneyCreditModal.vue index 786fb15..1dbd4a6 100644 --- a/src/components/MoneyCreditModal.vue +++ b/src/components/MoneyCreditModal.vue @@ -170,7 +170,6 @@ : false }, async newLinkTab() { - // This to ensure we are left with 2 decimals only this.amount = this.amount.toFixed(2) const { refreshTransaction, account } = this.$modal.args.value[0] diff --git a/src/components/MoneyTransferModal.vue b/src/components/MoneyTransferModal.vue index b907b71..c0f818b 100644 --- a/src/components/MoneyTransferModal.vue +++ b/src/components/MoneyTransferModal.vue @@ -262,7 +262,6 @@ account = account._obj.parent } this.account = account - // No need to declare in data, no live mechanism required here this.selectedBackend = makeUIProxyBackend(account.parent, this.$gettext) this.recipientBatchLoader = UseBatchLoading({ @@ -375,7 +374,6 @@ this.transferOngoing = false return } - // This to ensure we are left with 2 decimals only this.amount = parseFloat(this.amount).toFixed(2) let dateBegin = Date.now() let payment @@ -401,7 +399,6 @@ return } if (err.message === "User canceled the dialog box") { - // A warning message should have already been sent return } this.$msg.error( @@ -450,8 +447,6 @@ try { await this.selectedRecipient.toggleFavorite() } catch (err) { - // XXXvlab: using ``.then`` makes it trigger outside of - // view js grasp. this.$errorHandler(err) return } diff --git a/src/components/PendingTopUp.vue b/src/components/PendingTopUp.vue index 6b845bf..636d497 100644 --- a/src/components/PendingTopUp.vue +++ b/src/components/PendingTopUp.vue @@ -5,7 +5,11 @@ :can-cancel="false" :is-full-page="false" /> -

+

{{ $gettext("Unpaid top-up requests") }}

@@ -14,7 +18,7 @@ $gettext("The following top up requests needs to be paid or canceled") }}

-

[github-actions[bot]]

:evergreen_tree: test report

Passes: 8, failures: 2, pending: 0, skipped: 0, other: 0.

| State | Description | | ----- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | fail | **Filepath**: tests/e2e/spec.cy.ts
**Title**: General processes when logged in show base interface
**Error**: AssertionError: Timed out retrying after 15000ms: Expected to find element: `#the-transaction-list`, but never found it. | | fail | **Filepath**: tests/e2e/spec.cy.ts
**Title**: General processes when logged in Top-up process
**Error**: AssertionError: Timed out retrying after 15000ms: Expected to find element: `.custom-amount-input`, but never found it. |

[vaab]

LGTM, live reviewed, pushed