fix(connect): test tropic authenticateDevice only for T3W1

Author: martykan

packages/connect/e2e/common.setup.ts

@@ -220,13 +220,18 @@ export const initTrezorConnect = async (
 // "1.9.3" - skip for FW exact with 1.9.3
 // "1.9.3-1.9.6" - skip for FW gte 1.9.3 && lte 1.9.6
 // "!T3T1" - skip for specific device model
+// "*T3T1" - run only on specific device models
 export const skipTest = (rules: string[]) => {
     if (!rules || !Array.isArray(rules)) return;
     if (!firmware) return;
     const fwModel = firmware.substring(0, 1);
     const fwMaster = firmware.includes('-main');
-    const deviceRule = rules.find(skip => skip === '!' + deviceModel);
-    if (deviceRule) return deviceRule;
+    const deviceRuleNegative = rules.find(skip => skip === '!' + deviceModel);
+    if (deviceRuleNegative) return deviceRuleNegative;
+
+    const anyDeviceRulePositive = rules.find(skip => skip.startsWith('*'));
+    const deviceRulePositive = rules.find(skip => skip === '*' + deviceModel);
+    if (anyDeviceRulePositive && !deviceRulePositive) return anyDeviceRulePositive;
 
     const rule = rules
         .filter(skip => skip.substring(0, 1) === fwModel || skip.substring(1, 2) === fwModel) // filter rules only for current model

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

@@ -38,7 +38,7 @@ describe('TrezorConnect.authenticateDevice', () => {
         ),
     };
 
-    conditionalTest(['!T2T1', '!T1B1'], 'validation successful', async () => {
+    conditionalTest(['*T3W1'], 'validation successful - tropic', async () => {
         const result = await TrezorConnect.authenticateDevice({
             config,
         });
@@ -54,6 +54,20 @@ describe('TrezorConnect.authenticateDevice', () => {
         });
     });
 
+    conditionalTest(['*T3T1', '*T3B1', '*T2B1'], 'validation successful - optiga', async () => {
+        const result = await TrezorConnect.authenticateDevice({
+            config,
+        });
+
+        expect(result).toMatchObject({
+            success: true,
+            payload: {
+                optigaResult: { valid: true },
+                tropicResult: null,
+            },
+        });
+    });
+
     conditionalTest(
         ['!T2T1', '!T1B1'],
         'validation unsuccessful (rootPubKey not found)',
@@ -83,14 +97,13 @@ describe('TrezorConnect.authenticateDevice', () => {
                 success: true,
                 payload: {
                     optigaResult: { valid: false, error: 'ROOT_PUBKEY_NOT_FOUND' },
-                    tropicResult: null,
                 },
             });
         },
     );
 
     conditionalTest(
-        ['!T2T1', '!T1B1'],
+        ['*T3T1', '*T3B1', '*T2B1'],
         'sanity check unsuccessful (caPubkey is on blacklist)',
         async () => {
             const result = await TrezorConnect.authenticateDevice({
@@ -110,7 +123,6 @@ describe('TrezorConnect.authenticateDevice', () => {
                 success: true,
                 payload: {
                     optigaResult: { valid: false, error: 'CA_PUBKEY_BLACKLISTED' },
-                    tropicResult: null,
                 },
             });
         },