Fix flaky connect tests

packages/blockchain-link/src/workers/blockfrost/index.ts

@@ -91,7 +91,8 @@ const pushTransaction = async (request: Request<MessageTypes.PushTransaction>) =
 
 const getAccountInfo = async (request: Request<MessageTypes.GetAccountInfo>) => {
     const api = await request.connect();
-    const info = await api.getAccountInfo(request.payload);
+    const { details = 'basic', ...rest } = request.payload;
+    const info = await api.getAccountInfo({ details, ...rest });
 
     return {
         type: RESPONSES.GET_ACCOUNT_INFO,

packages/connect/e2e/common.setup.ts

@@ -127,10 +127,12 @@ export const setup = async (
     );
 };
 
+type InitParams = Partial<Parameters<typeof TrezorConnect.init>[0]> & { autoConfirm?: boolean };
+
 export const initTrezorConnect = async (
     // eslint-disable-next-line @typescript-eslint/no-shadow
     TrezorUserEnvLink: TrezorUserEnvLinkClass,
-    options?: Partial<Parameters<typeof TrezorConnect.init>[0]>,
+    { autoConfirm = true, ...options }: InitParams = {},
 ) => {
     TrezorConnect.removeAllListeners();
 
@@ -162,9 +164,12 @@ export const initTrezorConnect = async (
         });
     });
 
-    TrezorConnect.on(UI.REQUEST_BUTTON, () => {
-        setTimeout(() => TrezorUserEnvLink.send({ type: 'emulator-press-yes' }), 1);
-    });
+    if (autoConfirm) {
+        TrezorConnect.on(UI.REQUEST_BUTTON, e => {
+            if (e.code === 'ButtonRequest_PinEntry') return;
+            setTimeout(() => TrezorUserEnvLink.send({ type: 'emulator-press-yes' }), 1);
+        });
+    }
 
     await TrezorConnect.init({
         manifest: {
@@ -241,3 +246,11 @@ export const conditionalTest = (rules: string[], ...args: any) => {
     // @ts-expect-error
     return testMethod(...args);
 };
+
+export const conditionalDescribe = (rules: string[], ...args: any) => {
+    const skipMethod = typeof jest !== 'undefined' ? describe.skip : xdescribe;
+    const testMethod = skipTest(rules) ? skipMethod : describe;
+
+    // @ts-expect-error
+    return testMethod(...args);
+};

packages/connect/e2e/tests/device/authorizeCoinjoin.test.ts

@@ -1,9 +1,17 @@
 import TrezorConnect from '../../../src';
-import { getController, setup, conditionalTest, initTrezorConnect } from '../../common.setup';
+import {
+    getController,
+    setup,
+    conditionalTest,
+    conditionalDescribe,
+    initTrezorConnect,
+} from '../../common.setup';
 
 const controller = getController();
 
-describe('TrezorConnect.authorizeCoinjoin', () => {
+// skip T3T1 until `emulator-apply-settings` with `auto_lock_delay_ms` is fixed on emu
+// https://github.com/trezor/trezor-user-env/issues/280
+conditionalDescribe(['!T3T1'], 'TrezorConnect.authorizeCoinjoin', () => {
     beforeAll(async () => {
         await setup(controller, {
             mnemonic: 'mnemonic_all',

packages/connect/e2e/tests/device/cancel.test.ts

@@ -1,6 +1,6 @@
 import { StartEmu, SetupEmu } from '@trezor/trezor-user-env-link';
 
-import { getController, initTrezorConnect } from '../../common.setup';
+import { conditionalTest, getController, initTrezorConnect } from '../../common.setup';
 import TrezorConnect from '../../../src';
 
 const getAddress = (showOnTrezor: boolean, coin: string = 'regtest') => {
@@ -159,8 +159,7 @@ describe('TrezorConnect.cancel', () => {
         await assertGetAddressWorks();
     });
 
-    // todo: this should be conditionalTest(['2'])
-    it('Pin request - Cancel', async () => {
+    conditionalTest(['2'], 'Pin request - Cancel', async () => {
         await setupTest({
             setupParams: {
                 version: '1-latest',
@@ -190,8 +189,7 @@ describe('TrezorConnect.cancel', () => {
         expect(feat.payload).toMatchObject({ initialized: true });
     });
 
-    // todo: this should be conditionalTest(['2'])
-    it('Word request - Cancel', async () => {
+    conditionalTest(['2'], 'Word request - Cancel', async () => {
         await controller.startEmu({ version: '1-latest', model: 'T1B1', wipe: true });
         await controller.startBridge(
             // @ts-expect-error

packages/connect/e2e/tests/device/override.test.ts

@@ -8,7 +8,7 @@ describe('TrezorConnect override param', () => {
         await setup(controller, {
             mnemonic: 'mnemonic_all',
         });
-        await initTrezorConnect(controller);
+        await initTrezorConnect(controller, { autoConfirm: false });
     });
 
     afterAll(() => {

packages/connect/e2e/tests/device/setBusy.test.ts

@@ -1,9 +1,17 @@
 import TrezorConnect from '../../../src';
-import { getController, setup, conditionalTest, initTrezorConnect } from '../../common.setup';
+import {
+    getController,
+    setup,
+    conditionalTest,
+    initTrezorConnect,
+    conditionalDescribe,
+} from '../../common.setup';
 
 const controller = getController();
 
-describe('TrezorConnect.setBusy', () => {
+// skip T3T1 until `emulator-apply-settings` with `auto_lock_delay_ms` is fixed on emu
+// https://github.com/trezor/trezor-user-env/issues/280
+conditionalDescribe(['!T3T1'], 'TrezorConnect.setBusy', () => {
     beforeAll(async () => {
         await setup(controller, {
             mnemonic: 'mnemonic_all',