diff --git a/tests_zemu/tests/migration.test.ts b/tests_zemu/tests/migration.test.ts index 8dec52e0..bba05c53 100644 --- a/tests_zemu/tests/migration.test.ts +++ b/tests_zemu/tests/migration.test.ts @@ -19,6 +19,7 @@ import Zemu, { ButtonKind, ClickNavigation, TouchNavigation } from '@zondax/zemu import { ASTAR_PATH, defaultOptions, DOT_SS58_PREFIX, migrationModels, PATH } from './common' import { PolkadotGenericApp } from '@zondax/ledger-substrate' import { IButton, SwipeDirection } from '@zondax/zemu/dist/types' +import { isTouchDevice } from '@zondax/zemu/dist/zondax' const polkadot_pk = 'e1b4d72d27b3e91b9b6116555b4ea17138ddc12ca7cdbab30e2e0509bd848419' const astar_pk = 'cf557b2d2bebf3e14f932fec31d2b3ea776b63eede6658e282c9ab3f27d1287b' @@ -29,21 +30,9 @@ describe('Migration', function () { test.concurrent.each(migrationModels)('main menu + get version', async function (m) { const sim = new Zemu(m.path) try { - let migrationStartText = '' - switch (m.name) { - case 'nanos': - migrationStartText = 'Migration' - break; - - case 'nanosp': - case 'nanox': - migrationStartText = 'Please' - break; - - case 'stax': - case 'flex': - migrationStartText = 'Review' - break; + let migrationStartText = 'review' + if (m.name === 'nanos') { + migrationStartText = 'Migration' } await sim.start({ @@ -53,7 +42,7 @@ describe('Migration', function () { }) let nav = undefined; - if (m.name === 'stax' || m.name === "flex") { + if (isTouchDevice(m.name)) { const okButton: IButton = { x: 200, y: 550, diff --git a/tests_zemu/tests/standard.test.ts b/tests_zemu/tests/standard.test.ts index 1606515e..310abc1f 100644 --- a/tests_zemu/tests/standard.test.ts +++ b/tests_zemu/tests/standard.test.ts @@ -17,6 +17,7 @@ import Zemu, { ButtonKind, zondaxMainmenuNavigation } from '@zondax/zemu' import { defaultOptions, DOT_SS58_PREFIX, PATH, models } from './common' import { PolkadotGenericApp } from '@zondax/ledger-substrate' +import { isTouchDevice } from '@zondax/zemu/dist/zondax' const expected_address = '166wVhuQsKFeb7bd1faydHgVvX1bZU2rUuY7FJmWApNz2fQY' const expected_pk = 'e1b4d72d27b3e91b9b6116555b4ea17138ddc12ca7cdbab30e2e0509bd848419' @@ -85,7 +86,7 @@ describe('Standard', function () { await sim.start({ ...defaultOptions, model: m.name, - approveKeyword: (m.name === 'stax' || m.name === 'flex') ? 'Public key' : '', + approveKeyword: isTouchDevice(m.name) ? 'Public key' : '', approveAction: ButtonKind.ApproveTapButton, }) const app = new PolkadotGenericApp(sim.getTransport(), 'dot', '') @@ -112,7 +113,7 @@ describe('Standard', function () { await sim.start({ ...defaultOptions, model: m.name, - rejectKeyword: (m.name === 'stax' || m.name === 'flex') ? 'Public key' : '', + rejectKeyword: isTouchDevice(m.name) ? 'Public key' : '', }) const app = new PolkadotGenericApp(sim.getTransport(), 'dot')