Merge branch 'fix-test-checked-checks'

Author: tobias-jarvelov

desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/daita-settings/daita-settings.spec.ts

@@ -32,13 +32,13 @@ test.describe('DAITA settings', () => {
     await routes.daitaSettings.setEnableDaitaSwitch(false);
     const daitaSwitch = routes.daitaSettings.getEnableDaitaSwitch();
 
-    await expect(daitaSwitch).toHaveAttribute('aria-checked', 'false');
+    await expect(daitaSwitch).not.toBeChecked();
   });
 
   test('Should enable DAITA when clicking switch', async () => {
     await routes.daitaSettings.setEnableDaitaSwitch(true);
     const daitaSwitch = routes.daitaSettings.getEnableDaitaSwitch();
 
-    await expect(daitaSwitch).toHaveAttribute('aria-checked', 'true');
+    await expect(daitaSwitch).toBeChecked();
   });
 });

desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/multihop-settings/multihop-settings.spec.ts

@@ -31,13 +31,13 @@ test.describe('Multihop settings', () => {
     await routes.multihopSettings.setEnableMultihopSwitch(false);
     const multihopSwitch = routes.multihopSettings.getEnableMultihopSwitch();
 
-    await expect(multihopSwitch).toHaveAttribute('aria-checked', 'false');
+    await expect(multihopSwitch).not.toBeChecked();
   });
 
   test('Should enable multihop when clicking switch', async () => {
     await routes.multihopSettings.setEnableMultihopSwitch(true);
     const multihopSwitch = routes.multihopSettings.getEnableMultihopSwitch();
 
-    await expect(multihopSwitch).toHaveAttribute('aria-checked', 'true');
+    await expect(multihopSwitch).toBeChecked();
   });
 });

desktop/packages/mullvad-vpn/test/e2e/installed/state-dependent/vpn-settings/vpn-settings.spec.ts

@@ -39,11 +39,11 @@ test.describe('VPN settings', () => {
     test.afterEach(async () => {
       await routes.vpnSettings.setAutoConnectSwitch(false);
       const autoConnectSwitch = routes.vpnSettings.getAutoConnectSwitch();
-      await expect(autoConnectSwitch).toHaveAttribute('aria-checked', 'false');
+      await expect(autoConnectSwitch).not.toBeChecked();
 
       await routes.vpnSettings.setLaunchAppOnStartupSwitch(false);
       const launchOnStartupSwitch = routes.vpnSettings.getLaunchAppOnStartupSwitch();
-      await expect(launchOnStartupSwitch).toHaveAttribute('aria-checked', 'false');
+      await expect(launchOnStartupSwitch).not.toBeChecked();
     });
 
     test.describe('Launch app on start-up', () => {
@@ -54,7 +54,7 @@ test.describe('VPN settings', () => {
 
         await routes.vpnSettings.setLaunchAppOnStartupSwitch(true);
         const launchOnStartupSwitch = routes.vpnSettings.getLaunchAppOnStartupSwitch();
-        await expect(launchOnStartupSwitch).toHaveAttribute('aria-checked', 'true');
+        await expect(launchOnStartupSwitch).toBeChecked();
 
         if (process.platform === 'linux') {
           expect(autoStartPathExists()).toBeTruthy();
@@ -73,7 +73,7 @@ test.describe('VPN settings', () => {
       test('Should be enabled when switch is clicked', async () => {
         await routes.vpnSettings.setAutoConnectSwitch(true);
         const autoConnectSwitchChecked = routes.vpnSettings.getAutoConnectSwitch();
-        await expect(autoConnectSwitchChecked).toHaveAttribute('aria-checked', 'true');
+        await expect(autoConnectSwitchChecked).toBeChecked();
       });
 
       test('Should not enable cli auto-connect when enabled alone', async () => {
@@ -88,38 +88,39 @@ test.describe('VPN settings', () => {
       await routes.vpnSettings.setAutoConnectSwitch(true);
 
       const launchOnStartupSwitch = routes.vpnSettings.getLaunchAppOnStartupSwitch();
-      await expect(launchOnStartupSwitch).toHaveAttribute('aria-checked', 'true');
+      await expect(launchOnStartupSwitch).toBeChecked();
 
       const autoConnectSwitchChecked = routes.vpnSettings.getAutoConnectSwitch();
-      await expect(autoConnectSwitchChecked).toHaveAttribute('aria-checked', 'true');
+      await expect(autoConnectSwitchChecked).toBeChecked();
 
       const cliAutoConnect = execSync('mullvad auto-connect get').toString();
       expect(cliAutoConnect).toContain('on');
     });
   });
 
   test.describe('LAN settings', () => {
-    const expectLocalNetworkSharing = async (
-      ariaChecked: 'true' | 'false',
-      cliState: 'allow' | 'block',
-    ) => {
+    const expectLocalNetworkSharing = async (checked: boolean, cliState: 'allow' | 'block') => {
       const lanSwitch = routes.vpnSettings.getLanSwitch();
-      await expect(lanSwitch).toHaveAttribute('aria-checked', ariaChecked);
+      if (checked) {
+        await expect(lanSwitch).toBeChecked();
+      } else {
+        await expect(lanSwitch).not.toBeChecked();
+      }
       const cliStateOutput = execSync('mullvad lan get').toString();
       expect(cliStateOutput).toContain(cliState);
     };
 
     const expectLocalNetworkSharingEnabled = async () => {
-      await expectLocalNetworkSharing('true', 'allow');
+      await expectLocalNetworkSharing(true, 'allow');
     };
 
     const expectLocalNetworkSharingDisabled = async () => {
-      await expectLocalNetworkSharing('false', 'block');
+      await expectLocalNetworkSharing(false, 'block');
     };
 
     const disableLocalNetworkSharing = async () => {
       const lanSwitch = routes.vpnSettings.getLanSwitch();
-      if ((await lanSwitch.getAttribute('aria-checked')) === 'true') {
+      if (await lanSwitch.isChecked()) {
         await lanSwitch.click();
       }
       await expectLocalNetworkSharingDisabled();

desktop/packages/mullvad-vpn/test/e2e/route-object-models/daita-settings/daita-settings-route-object-model.ts

@@ -18,11 +18,11 @@ export class DaitaSettingsRouteObjectModel {
     return this.selectors.enableDaitaSwitch();
   }
 
-  async setEnableDaitaSwitch(enabled: boolean) {
+  async setEnableDaitaSwitch(enable: boolean) {
     const enableDaitaSwitch = this.selectors.enableDaitaSwitch();
-    const ariaChecked = await enableDaitaSwitch.getAttribute('aria-checked');
+    const checked = await enableDaitaSwitch.isChecked();
 
-    if ((enabled && ariaChecked === 'false') || (!enabled && ariaChecked === 'true')) {
+    if ((enable && !checked) || (!enable && checked)) {
       await enableDaitaSwitch.click();
     }
   }

desktop/packages/mullvad-vpn/test/e2e/route-object-models/multihop-settings/multihop-settings-route-object-model.ts

@@ -18,11 +18,11 @@ export class MultihopSettingsRouteObjectModel {
     return this.selectors.enableMultihopSwitch();
   }
 
-  async setEnableMultihopSwitch(enabled: boolean) {
+  async setEnableMultihopSwitch(enable: boolean) {
     const enableMultihopSwitch = this.selectors.enableMultihopSwitch();
-    const ariaChecked = await enableMultihopSwitch.getAttribute('aria-checked');
+    const checked = await enableMultihopSwitch.isChecked();
 
-    if ((enabled && ariaChecked === 'false') || (!enabled && ariaChecked === 'true')) {
+    if ((enable && !checked) || (!enable && checked)) {
       await enableMultihopSwitch.click();
     }
   }

desktop/packages/mullvad-vpn/test/e2e/route-object-models/vpn-settings/vpn-settings-route-object-model.ts

@@ -25,11 +25,11 @@ export class VpnSettingsRouteObjectModel extends NavigationObjectModel {
     return this.selectors.autoConnectSwitch();
   }
 
-  async setAutoConnectSwitch(enabled: boolean) {
+  async setAutoConnectSwitch(enable: boolean) {
     const autoConnectSwitch = this.getAutoConnectSwitch();
-    const ariaChecked = await autoConnectSwitch.getAttribute('aria-checked');
+    const checked = await autoConnectSwitch.isChecked();
 
-    if ((enabled && ariaChecked === 'false') || (!enabled && ariaChecked === 'true')) {
+    if ((enable && !checked) || (!enable && checked)) {
       await autoConnectSwitch.click();
     }
   }
@@ -38,10 +38,10 @@ export class VpnSettingsRouteObjectModel extends NavigationObjectModel {
     return this.selectors.launchAppOnStartupSwitch();
   }
 
-  async setLaunchAppOnStartupSwitch(enabled: boolean) {
+  async setLaunchAppOnStartupSwitch(enable: boolean) {
     const launchAppOnStartupSwitch = this.getLaunchAppOnStartupSwitch();
-    const ariaChecked = await launchAppOnStartupSwitch.getAttribute('aria-checked');
-    if ((enabled && ariaChecked === 'false') || (!enabled && ariaChecked === 'true')) {
+    const checked = await launchAppOnStartupSwitch.isChecked();
+    if ((enable && !checked) || (!enable && checked)) {
       await launchAppOnStartupSwitch.click();
     }
   }
@@ -52,9 +52,9 @@ export class VpnSettingsRouteObjectModel extends NavigationObjectModel {
 
   async setLanSwitch(enabled: boolean) {
     const lanSwitch = this.getLanSwitch();
-    const ariaChecked = await lanSwitch.getAttribute('aria-checked');
+    const checked = await lanSwitch.isChecked();
 
-    if ((enabled && ariaChecked === 'false') || (!enabled && ariaChecked === 'true')) {
+    if ((enabled && !checked) || (!enabled && checked)) {
       await lanSwitch.click();
     }
   }