misc tests improvements

ci/test.yml

@@ -200,6 +200,7 @@ transport manual:
     COMPOSE_PROJECT_NAME: $CI_JOB_ID
     COMPOSE_FILE: ./docker/docker-compose.connect-popup-ci.yml
     URL: ${DEV_SERVER_URL}/connect/${CI_BUILD_REF_NAME}/
+    TEST_FILE: $TEST_FILE
   script:
     - yarn install --immutable
     - docker-compose pull
@@ -216,6 +217,11 @@ transport manual:
       - ./packages/connect-popup/connect-popup-overview.html
       - ./packages/connect-popup/test-results
   interruptible: true
+  parallel:
+    matrix:
+      - TEST_FILE: ["methods"]
+      - TEST_FILE: ["popup-close"]
+      - TEST_FILE: ["unchained"]
 
 connect-popup:
   extends: .e2e connect-popup

docker/docker-compose.connect-popup-ci.yml

@@ -20,7 +20,8 @@ services:
       - CI_JOB_URL=$CI_JOB_URL
       - CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH
       - CI_JOB_NAME=$CI_JOB_NAME
+      - TEST_FILE=$TEST_FILE
     working_dir: /e2e
-    command: bash -c "npx playwright install && yarn workspace @trezor/connect-popup test:e2e"
+    command: bash -c "npx playwright install && yarn workspace @trezor/connect-popup test:e2e $TEST_FILE"
     volumes:
       - ../:/e2e

packages/connect-popup/e2e/tests/popup-close.test.ts

@@ -61,6 +61,7 @@ test.beforeAll(async () => {
             requests.push({ url: request.url() });
         });
 
+        let requestIndex = 0;
         page.on('response', async response => {
             // ignore other than bridge requests
             if (!response.url().startsWith('http://127.0.0.1:21325')) {
@@ -69,7 +70,8 @@ test.beforeAll(async () => {
             if (response.url().endsWith('release/2')) {
                 releasePromise!.resolve(undefined);
             }
-            console.log(response.status(), response.url());
+            console.log(requestIndex, response.status(), response.url());
+            requestIndex++;
             responses.push({
                 url: response.url(),
                 status: response.status(),

packages/suite-web/e2e/tests/suite/passphrase-cancel.test.ts

@@ -0,0 +1,33 @@
+// @group:passphrase
+// @retry=2
+
+const testedVersions = ['2-latest', '1-latest'];
+
+describe('Passphrase cancel', () => {
+    beforeEach(() => {
+        cy.viewport(1080, 1440).resetDb();
+    });
+
+    testedVersions.forEach(version => {
+        it(version, () => {
+            cy.task('startEmu', { wipe: true, version });
+            cy.task('setupEmu', {
+                mnemonic: 'all all all all all all all all all all all all',
+                passphrase_protection: true,
+            });
+            cy.task('startBridge');
+            cy.prefixedVisit('/');
+            cy.passThroughInitialRun();
+
+            cy.getTestElement('@passphrase/input').type('abc');
+            cy.getTestElement('@passphrase/hidden/submit-button').click();
+            cy.getTestElement('@suite/modal/confirm-action-on-device');
+
+            cy.getTestElement('@modal/close-button').click();
+            cy.getTestElement('@toast/auth-failed');
+            // todo: interesting fact is that model One and model T have different text in the toast notification
+        });
+    });
+});
+
+export {};

packages/suite-web/e2e/tests/suite/safety-checks-warning.test.ts

@@ -41,6 +41,7 @@ describe('safety_checks Warning For PromptTemporarily', () => {
         });
         cy.get(`[data-test="@radio-button-prompt"]`).click();
         cy.getTestElement('@safety-checks-apply').click();
+        cy.getTestElement('@prompts/confirm-on-device');
         cy.task('pressYes');
     });
 
@@ -67,6 +68,7 @@ describe('safety_checks Warning For PromptTemporarily', () => {
         });
         cy.get('[data-test="@radio-button-strict"]').click();
         cy.getTestElement('@safety-checks-apply').click();
+        cy.getTestElement('@prompts/confirm-on-device');
         cy.task('pressYes');
         // Assert the warning is gone.
         cy.getTestElement('@banner/safety-checks/button').should('not.exist');
@@ -81,6 +83,7 @@ describe('safety_checks Warning For PromptTemporarily', () => {
         });
         cy.get('[data-test="@radio-button-strict"]').click();
         cy.getTestElement('@safety-checks-apply').click();
+        cy.getTestElement('@prompts/confirm-on-device');
         cy.task('pressYes');
         // Assert the warning is gone.
         cy.getTestElement('@banner/safety-checks/button').should('not.exist');
@@ -90,6 +93,7 @@ describe('safety_checks Warning For PromptTemporarily', () => {
         });
         cy.get(`[data-test="@radio-button-prompt"]`).click();
         cy.getTestElement('@safety-checks-apply').click();
+        cy.getTestElement('@prompts/confirm-on-device');
         cy.task('pressYes');
         // Assert the warning appear again.
         cy.getTestElement('@banner/safety-checks/button');

packages/suite-web/e2e/tests/wallet/import-btc-csv.test.ts

@@ -66,12 +66,10 @@ describe('Import a BTC csv file', () => {
                 // process data
                 cy.getTestElement('outputs[0].address')
                     .should('be.visible')
-                    .invoke('val')
-                    .should('equal', firstAddress);
+                    .should('have.value', firstAddress);
                 cy.getTestElement('outputs[1].address')
                     .should('be.visible')
-                    .invoke('val')
-                    .should('equal', secondAddress);
+                    .should('have.value', secondAddress);
                 cy.log(secondAddress);
             });
         });

packages/transport/e2e/run.ts

@@ -8,6 +8,9 @@ import argv from './jest.config';
     // Before actual tests start, establish connection with trezor-user-env
     await TrezorUserEnvLink.connect();
 
+    // @ts-expect-error
+    argv.runInBand = true;
+
     // @ts-expect-error
     const { results } = await runCLI(argv, [__dirname]);
 

packages/transport/jest.config.js

@@ -1,9 +1,9 @@
-/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
 module.exports = {
     preset: 'ts-jest',
     testEnvironment: 'node',
-    testMatch: ['**/tests/*.test.js'],
+    testMatch: ['**/tests/*.test.ts'],
     modulePathIgnorePatterns: ['node_modules', '<rootDir>/lib', '<rootDir>/libDev'],
     collectCoverage: true,
     collectCoverageFrom: ['src/**/*.ts'],
+    testPathIgnorePatterns: ['e2e'],
 };

packages/transport/tests/build-receive.test.js → packages/transport/tests/build-receive.test.ts

@@ -1,9 +1,7 @@
-const { parseConfigure } = require('../src/lowlevel/protobuf/messages');
-const { buildOne } = require('../src/lowlevel/send');
-const { receiveOne } = require('../src/lowlevel/receive');
+import * as protobuf from 'protobufjs/light';
 
-const { buildBuffers } = require('../src/lowlevel/send');
-const { receiveAndParse } = require('../src/lowlevel/receive');
+import { buildOne, buildBuffers } from '../src/lowlevel/send';
+import { receiveOne, receiveAndParse } from '../src/lowlevel/receive';
 
 const messages = {
     StellarPaymentOp: {
@@ -91,7 +89,7 @@ const fixtures = [
     },
 ];
 
-const parsedMessages = parseConfigure({
+const parsedMessages = protobuf.Root.fromJSON({
     nested: { hw: { nested: { trezor: { nested: { messages: { nested: messages } } } } } },
 });
 
@@ -102,7 +100,7 @@ describe('encoding json -> protobuf -> json', () => {
                 // encoded message
                 const encodedMessage = buildOne(parsedMessages, f.name, f.in);
                 // then decode message and check, whether decoded message matches original json
-                const decodedMessage = receiveOne(parsedMessages, encodedMessage);
+                const decodedMessage = receiveOne(parsedMessages, encodedMessage.toString('hex'));
                 expect(decodedMessage.type).toEqual(f.name);
                 expect(decodedMessage.message).toEqual(f.in);
             });

packages/transport/tests/encode-decode-basic.test.js → packages/transport/tests/encode-decode-basic.test.ts

@@ -1,7 +1,7 @@
-const { encode } = require('../src/lowlevel/protobuf/encode');
-const { decode } = require('../src/lowlevel/protobuf/decode');
+import * as ProtoBuf from 'protobufjs/light';
 
-const ProtoBuf = require('protobufjs/light');
+import { encode } from '../src/lowlevel/protobuf/encode';
+import { decode } from '../src/lowlevel/protobuf/decode';
 
 const messages = {
     nested: {
@@ -197,7 +197,7 @@ describe('basic concepts', () => {
     describe('primitives encode/decode', () => {
         basicFixtures.forEach(f => {
             describe(f.name, () => {
-                const Message = Messages.lookup(`messages.${f.name}`);
+                const Message = Messages.lookupType(`messages.${f.name}`);
 
                 test(f.name, () => {
                     // serialize new way - this is to confirm new lib won't break old behavior
@@ -215,7 +215,7 @@ describe('basic concepts', () => {
     describe('advanced', () => {
         advancedFixtures.forEach(f => {
             describe(f.name, () => {
-                const Message = Messages.lookup(`messages.${f.name}`);
+                const Message = Messages.lookupType(`messages.${f.name}`);
 
                 test(f.name, () => {
                     // serialize new way - this is to confirm new lib won't break old behavior
@@ -254,7 +254,7 @@ describe('basic concepts', () => {
             };
 
             const SenderMessages = ProtoBuf.Root.fromJSON(messages);
-            const senderEncoded = encode(SenderMessages.lookup('messages.ButtonRequest'), {
+            const senderEncoded = encode(SenderMessages.lookupType('messages.ButtonRequest'), {
                 type: 'foo',
                 pages: 123,
             });
@@ -265,7 +265,7 @@ describe('basic concepts', () => {
             const ReceiverMessages = ProtoBuf.Root.fromJSON(receiverMessages);
 
             expect(() => {
-                decode(ReceiverMessages.lookup('messages.ButtonRequest'), senderEncoded);
+                decode(ReceiverMessages.lookupType('messages.ButtonRequest'), senderEncoded);
             }).toThrow();
         });
     });

packages/transport/tests/encode-decode.test.js → packages/transport/tests/encode-decode.test.ts

@@ -1,7 +1,7 @@
-const ProtoBuf = require('protobufjs/light');
+import * as ProtoBuf from 'protobufjs/light';
 
-const { encode } = require('../src/lowlevel/protobuf/encode');
-const { decode } = require('../src/lowlevel/protobuf/decode');
+import { encode } from '../src/lowlevel/protobuf/encode';
+import { decode } from '../src/lowlevel/protobuf/decode';
 
 const HDNodeType = {
     fields: {
@@ -521,9 +521,10 @@ describe('Real messages', () => {
     fixtures.forEach(f => {
         describe(f.name, () => {
             const Messages = ProtoBuf.Root.fromJSON({
+                // @ts-expect-error
                 nested: { messages: { nested: { ...f.message } } },
             });
-            const Message = Messages.lookup(`messages.${f.name}`);
+            const Message = Messages.lookupType(`messages.${f.name}`);
 
             test('encode and decode', () => {
                 // serialize
@@ -538,6 +539,7 @@ describe('Real messages', () => {
 
     test('without Messages object', () => {
         expect(() => {
+            // @ts-expect-error
             encode(null, {});
         }).toThrowError();
     });

packages/transport/tests/messages.test.js → packages/transport/tests/messages.test.ts

@@ -1,5 +1,6 @@
-const { createMessageFromName } = require('../src/lowlevel/protobuf/messages');
-const { parseConfigure } = require('../src/lowlevel/protobuf/messages');
+import * as protobuf from 'protobufjs/light';
+
+import { createMessageFromName } from '../src/lowlevel/protobuf/messages';
 
 const json = {
     nested: {
@@ -49,14 +50,7 @@ const json = {
 
 describe('messages', () => {
     test('createMessageFromName (wire_type case)', () => {
-        const messages = parseConfigure(json);
-        const name = 'TxAckPrevExtraData';
-
-        expect(() => createMessageFromName(messages, name)).not.toThrow();
-    });
-
-    test('[compatibility]: descriptors as string', () => {
-        const messages = parseConfigure(JSON.stringify(json));
+        const messages = protobuf.Root.fromJSON(json);
         const name = 'TxAckPrevExtraData';
 
         expect(() => createMessageFromName(messages, name)).not.toThrow();