Update tests to use role selectors instead of data-testid

4 files changed, 11 insertions, 6 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/open-vpn-settings/components/bridge-mode-setting/BridgeModeSetting.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/open-vpn-settings/components/bridge-mode-setting/BridgeModeSetting.tsx
index f49a70e8d2..b9c414b76c 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/open-vpn-settings/components/bridge-mode-setting/BridgeModeSetting.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/open-vpn-settings/components/bridge-mode-setting/BridgeModeSetting.tsx
@@ -93,8 +93,7 @@ export function BridgeModeSetting() {
         <DefaultListboxOption value={'auto'}>{messages.gettext('Automatic')}</DefaultListboxOption>
         <DefaultListboxOption
           value={'on'}
-          disabled={tunnelProtocol !== 'openvpn' || transportProtocol === 'udp'}
-          data-testid="bridge-mode-on">
+          disabled={tunnelProtocol !== 'openvpn' || transportProtocol === 'udp'}>
           {messages.gettext('On')}
         </DefaultListboxOption>
         <DefaultListboxOption value={'off'}>{messages.gettext('Off')}</DefaultListboxOption>
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/wireguard-settings/components/obfuscation-settings/ObfuscationSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/wireguard-settings/components/obfuscation-settings/ObfuscationSettings.tsx
index 630a94fa93..c9939df199 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/wireguard-settings/components/obfuscation-settings/ObfuscationSettings.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/wireguard-settings/components/obfuscation-settings/ObfuscationSettings.tsx
@@ -67,7 +67,7 @@ export function ObfuscationSettings() {
         </Listbox.Content>
       </Listbox.Item>
       <Listbox.Options>
-        <DefaultListboxOption value={ObfuscationType.auto} data-testid="automatic-obfuscation">
+        <DefaultListboxOption value={ObfuscationType.auto}>
           {messages.gettext('Automatic')}
         </DefaultListboxOption>
         <SplitListboxOption value={ObfuscationType.shadowsocks}>
diff --git a/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/custom-bridge.spec.ts b/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/custom-bridge.spec.ts
index 9be24d838b..53f66ccf98 100644
--- a/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/custom-bridge.spec.ts
+++ b/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/custom-bridge.spec.ts
@@ -36,7 +36,8 @@ test('App should enable bridge mode', async () => {
   await page.getByText('OpenVPN settings').click();
   await util.waitForRoute(RoutePath.openVpnSettings);
 
-  const bridgeModeOnButton = page.getByTestId('bridge-mode-on');
+  const bridgeModeListox = page.getByRole('listbox', { name: 'Bridge mode' });
+  const bridgeModeOnButton = bridgeModeListox.getByRole('option', { name: 'On', exact: true });
   await bridgeModeOnButton.click();
   await expect(bridgeModeOnButton).toHaveAttribute('aria-selected', 'true');
 
diff --git a/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/obfuscation.spec.ts b/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/obfuscation.spec.ts
index d1d3cb2e01..4bea6d34e0 100644
--- a/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/obfuscation.spec.ts
+++ b/desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/obfuscation.spec.ts
@@ -35,8 +35,13 @@ test('App should have automatic obfuscation', async () => {
   await page.getByText('WireGuard settings').click();
   await util.waitForRoute(RoutePath.wireguardSettings);
 
-  const automatic = page.getByTestId('automatic-obfuscation');
-  await expect(automatic).toHaveCSS('background-color', colorTokens.green);
+  const obfuscationListbox = page.getByRole('listbox', { name: 'Obfuscation' });
+  await obfuscationListbox.highlight();
+  const automaticOption = obfuscationListbox.getByRole('option', {
+    name: 'Automatic',
+    exact: true,
+  });
+  await expect(automaticOption).toHaveAttribute('aria-selected', 'true');
 
   const cliObfuscation = execSync('mullvad obfuscation get').toString().split('\n');
   expect(cliObfuscation[0]).toEqual('Obfuscation mode: auto');