Do not open new project if invitation rejected. Fixes #1175 (#1176)

* Do not open new project if invitation rejected. Fixes #1175 * Only load new project on accept. Fixes #1175
NetsBlox · Jan 21, 2021 · d4ea358 · d4ea358
1 parent f630973
commit d4ea358
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/src/room.js b/src/room.js
@@ -774,7 +774,11 @@ RoomMorph.prototype.promptInvite = function (id, role, roomName, inviter) {
         'Would you like to move to "' + roomName + '"?' :
         inviter + ' has invited you to join\nhim/her at "' + roomName + '"';
 
-    dialog.cancel = () => this.respondToInvitation(id, role, false);
+    const superCancel = dialog.cancel;
+    dialog.cancel = () => {
+        this.respondToInvitation(id, role, false);
+        superCancel.call(dialog);
+    };
     dialog.askYesNo(
         'Room Invitation',
         localize(msg),
@@ -788,6 +792,8 @@ RoomMorph.prototype.respondToInvitation = function (id, role, accepted) {
         accepted,
         async project => {
             // Load the project or make the project empty
+            if (!accepted) return;
+
             this.ide.source = 'cloud';
             if (project.Public === 'true') {
                 location.hash = '#present:Username=' +

diff --git a/test/multi/collaboration.spec.js b/test/multi/collaboration.spec.js
@@ -2,6 +2,30 @@
 describe('collaboration', function() {
     this.timeout(7500);
 
+    it('should close prompt if rejected', async () => {
+        await driver.user1.reset();
+        const {SnapCloud} = driver.user2.globals();
+        driver.user1.invite(SnapCloud.username);
+        await driver.user2.expect(
+            () => driver.user2.dialogs()
+                .find(d => d.key && d.key.includes('invite')),
+            `Invited user never received invite`,
+            {maxWait: 1000}
+        );
+
+        const dialog = driver.user2.dialogs()
+            .filter(dialog => dialog.key)
+            .find(dialog => dialog.key.includes('invite'));
+        const cancelBtn = dialog.buttons.children.find(btn => btn.action === 'cancel');
+        driver.user2.click(cancelBtn);
+
+        await driver.user2.expect(
+            () => driver.user2.dialogs().length === 0,
+            'Dialog did not close. Maybe an error occurred?',
+            {maxWait: 1000}
+        );
+    });
+
     describe('NO existing edits', function() {
         before(async () => {
             await driver.user1.reset();

diff --git a/test/snap-driver.js b/test/snap-driver.js
@@ -40,14 +40,13 @@ SnapDriver.prototype.dialog = function() {
 // Controlling the IDE
 SnapDriver.prototype.reset = async function() {
     // Close all open dialogs
-    const oldVersion = this.ide().room.version;
     const dialogs = this.world().children.slice(1);
     dialogs.forEach(dialog => dialog.destroy());
 
     this.ide().exitReplayMode();
     await this.ide().newProject();
     await this.expect(
-        () => this.ide().room.version !== oldVersion,
+        () => this.ide().room.version !== -1,
         'No room state received'
     );
 };