@dxos/react-ui 0.1.36-next.ef27157 → 0.1.37-next.677bac1

package/src/playwright/invitations.spec.ts

@@ -4,6 +4,7 @@
 
 import { test } from '@playwright/test';
 import { expect } from 'chai';
+import waitForExpect from 'wait-for-expect';
 
 import { sleep } from '@dxos/async';
 import { ConnectionState, Invitation } from '@dxos/protocols/proto/dxos/client/services';
@@ -32,8 +33,7 @@ test.describe('Invitations', () => {
       expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
     });
 
-    // TODO(wittjosiah): Auth method not hooked up?
-    test.skip('no auth method', async () => {
+    test('no auth method', async () => {
       await manager.createIdentity(0);
       await manager.openPanel(0, 'devices');
       const invitation = await manager.createInvitation(0, 'device', { authMethod: Invitation.AuthMethod.NONE });
@@ -45,8 +45,7 @@ test.describe('Invitations', () => {
       expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
     });
 
-    // TODO(wittjosiah): Invalid auth code cannot retry.
-    test.skip('invalid & retry auth code', async () => {
+    test('invalid & retry auth code', async () => {
       await manager.createIdentity(0);
       await manager.openPanel(0, 'devices');
       const invitation = await manager.createInvitation(0, 'device');
@@ -61,29 +60,63 @@ test.describe('Invitations', () => {
       expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
     });
 
-    // TODO(wittjosiah): Invalid auth code cannot retry.
-    test.skip('invalid & max auth code retries reached, retry invitation', async () => {});
-
-    // TODO(wittjosiah): Trigger timeout.
-    test.skip('invitation timeout & retry', async () => {
+    test('invalid & max auth code retries reached, retry invitation', async () => {
       await manager.createIdentity(0);
       await manager.openPanel(0, 'devices');
-      const invitation = await manager.createInvitation(0, 'device', { timeout: 100 });
+      const invitation = await manager.createInvitation(0, 'device');
 
       await manager.openPanel(1, 'identity');
-      await sleep(100);
+      await manager.acceptInvitation(1, 'device', invitation);
 
-      // TODO(wittjosiah): Retry here.
+      await manager.authenticateInvitation('device', '000001', manager.peer(1));
+      await manager.clearAuthCode('device', manager.peer(1));
+      await manager.authenticateInvitation('device', '000002', manager.peer(1));
+      await manager.clearAuthCode('device', manager.peer(1));
+      await manager.authenticateInvitation('device', '000003', manager.peer(1));
+
+      expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+
+      await manager.resetInvitation(manager.peer(1));
+      await manager.invitationInputContinue('device', manager.peer(1));
+
+      const [authCode] = await Promise.all([manager.getAuthCode(), manager.clearAuthCode('device', manager.peer(1))]);
 
-      const [authCode] = await Promise.all([manager.getAuthCode(), manager.acceptInvitation(1, 'device', invitation)]);
       await manager.authenticateInvitation('device', authCode, manager.peer(1));
       await manager.doneInvitation('device', manager.peer(1));
 
       expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
     });
 
-    // TODO(wittjosiah): Propagate cancel to guest.
-    test.skip('invitation cancelled by host', async () => {});
+    test('invitation timeout', async () => {
+      await manager.createIdentity(0);
+      await manager.openPanel(0, 'devices');
+      const invitation = await manager.createInvitation(0, 'device', { timeout: 10 });
+
+      await manager.openPanel(1, 'identity');
+      await manager.acceptInvitation(1, 'device', invitation);
+
+      // Wait for timeout to fire.
+      await waitForExpect(async () => {
+        expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+      }, 100);
+    });
+
+    test('invitation cancelled by host', async () => {
+      await manager.createIdentity(0);
+      await manager.openPanel(0, 'devices');
+      const invitation = await manager.createInvitation(0, 'device');
+
+      await manager.openPanel(1, 'identity');
+      await manager.acceptInvitation(1, 'device', invitation);
+      // Wait for invitation to connect before cancelling it.
+      await sleep(100);
+      await manager.cancelInvitation('device', 'host', manager.peer(0));
+
+      // Wait for cancellation to propagate.
+      await waitForExpect(async () => {
+        expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+      }, 100);
+    });
 
     test('invitation cancelled by guest & retry', async () => {
       await manager.createIdentity(0);
@@ -102,8 +135,7 @@ test.describe('Invitations', () => {
       expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
     });
 
-    // TODO(wittjosiah): Propagating network failure is flaky.
-    test.skip('recover from network failure during invitation', async () => {
+    test('recover from network failure during invitation', async () => {
       await manager.createIdentity(0);
       await manager.openPanel(0, 'devices');
       const invitation = await manager.createInvitation(0, 'device');
@@ -114,6 +146,8 @@ test.describe('Invitations', () => {
       await manager.setConnectionState(0, ConnectionState.OFFLINE);
       await sleep(100);
       await manager.setConnectionState(0, ConnectionState.ONLINE);
+      // TODO(wittjosiah): Requires attempting an action to discover the network failure.
+      await manager.authenticateInvitation('device', '00000', manager.peer(1));
       await manager.resetInvitation(manager.peer(1));
       await manager.invitationInputContinue('device', manager.peer(1));
       const [authCode] = await Promise.all([manager.getAuthCode(), manager.clearAuthCode('device', manager.peer(1))]);
@@ -235,29 +269,40 @@ test.describe('Invitations', () => {
       expect(await manager.getSpaceName(0, 0)).to.equal(await manager.getSpaceName(1, 0));
     });
 
-    // TODO(wittjosiah): Trigger timeout.
-    test.skip('invitation timeout & retry', async () => {
+    test('invitation timeout', async () => {
       await manager.createIdentity(0);
       await manager.createSpace(0);
       await manager.openPanel(0, 0);
-      const invitation = await manager.createInvitation(0, 'space', { timeout: 100 });
+      const invitation = await manager.createInvitation(0, 'space', { timeout: 10 });
 
       await manager.createIdentity(1);
       await manager.openPanel(1, 'join');
-      await sleep(100);
+      await manager.acceptInvitation(1, 'space', invitation);
 
-      // TODO(wittjosiah): Retry here.
+      // Wait for timeout to fire.
+      await waitForExpect(async () => {
+        expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+      }, 100);
+    });
 
-      const [authCode] = await Promise.all([manager.getAuthCode(), manager.acceptInvitation(1, 'space', invitation)]);
-      await manager.authenticateInvitation('space', authCode, manager.peer(1));
-      await manager.doneInvitation('space', manager.peer(1));
+    test('invitation cancelled by host', async () => {
+      await manager.createIdentity(0);
+      await manager.createSpace(0);
+      await manager.openPanel(0, 0);
+      const invitation = await manager.createInvitation(0, 'space');
 
-      await manager.openPanel(0, 'spaces');
-      expect(await manager.getSpaceName(0, 0)).to.equal(await manager.getSpaceName(1, 0));
-    });
+      await manager.createIdentity(1);
+      await manager.openPanel(1, 'join');
+      await manager.acceptInvitation(1, 'space', invitation);
+      // Wait for invitation to connect before cancelling it.
+      await sleep(100);
+      await manager.cancelInvitation('space', 'host', manager.peer(0));
 
-    // TODO(wittjosiah): Propagate cancel to guest.
-    test.skip('invitation cancelled by host', async () => {});
+      // Wait for cancellation to propagate.
+      await waitForExpect(async () => {
+        expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+      }, 100);
+    });
 
     test('invitation cancelled by guest & retry', async () => {
       await manager.createIdentity(0);
@@ -281,8 +326,7 @@ test.describe('Invitations', () => {
       expect(await manager.getSpaceName(0, 0)).to.equal(await manager.getSpaceName(1, 0));
     });
 
-    // TODO(wittjosiah): Propagating network failure is flaky.
-    test.skip('recover from network failure during invitation', async () => {
+    test('recover from network failure during invitation', async () => {
       await manager.createIdentity(0);
       await manager.createSpace(0);
       await manager.openPanel(0, 0);
@@ -295,6 +339,8 @@ test.describe('Invitations', () => {
       await manager.setConnectionState(0, ConnectionState.OFFLINE);
       await sleep(100);
       await manager.setConnectionState(0, ConnectionState.ONLINE);
+      // TODO(wittjosiah): Requires attempting an action to discover the network failure.
+      await manager.authenticateInvitation('space', '00000', manager.peer(1));
       await manager.resetInvitation(manager.peer(1));
       await manager.invitationInputContinue('space', manager.peer(1));
       const [authCode] = await Promise.all([manager.getAuthCode(), manager.clearAuthCode('space', manager.peer(1))]);

package/src/testing/shell-manager.ts

@@ -31,6 +31,8 @@ export class ShellManager {
       await (scope || this.page)
         .getByTestId(`${type === 'device' ? 'halo' : 'space'}-invitation-authenticator-cancel`)
         .click();
+    } else {
+      await (scope || this.page).getByTestId('cancel-invitation').nth(0).click();
     }
   }