Merge branch 'main' into fix/sharedb-reconnection

Author: kpal81xd

docker-compose.yml

@@ -1,17 +1,19 @@
 services:
   test-suite:
     build: ./test-suite
-    image: playcanvas/editor-test:latest
-    container_name: test-suite
-    env_file:
-      - .env
-    volumes:
-      - ./test-suite/.auth:/usr/src/test/.auth
+    image: ghcr.io/playcanvas/editor/test:latest
+    command: "true"
 
   playcanvas-editor:
     build: .
     container_name: playcanvas-editor
+    depends_on:
+      test-suite:
+        condition: service_completed_successfully
     env_file:
       - .env
+    environment:
+      - PC_LOCAL_FRONTEND=true
     volumes:
+      - ./test-suite/.auth:/usr/src/test/.auth
       - ./test-results:/usr/src/test/test-results

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@playcanvas/editor",
-  "version": "2.19.8",
+  "version": "2.19.9",
   "author": "PlayCanvas <support@playcanvas.com>",
   "homepage": "https://playcanvas.com",
   "description": "The PlayCanvas Editor Frontend",

package.json

@@ -111,7 +111,9 @@ test.describe('export/import', () => {
         test.setTimeout(4 * 60 * 1000);
         expect(await capture('import-project', page, async () => {
             // close project dialog
-            await page.getByText('').click();
+            const close = page.locator('.picker-project .close');
+            await close.waitFor({ state: 'visible' });
+            await close.click();
 
             // import project
             const fileChooserPromise = page.waitForEvent('filechooser');
@@ -335,6 +337,9 @@ test.describe('publish/download', () => {
                 await page.getByText('Download', { exact: true }).nth(2).click();
                 await downloadPagePromise;
                 await downloadPromise;
+
+                // dismiss dialog
+                await page.locator('.picker-project .close').first().click();
             })).toStrictEqual([]);
         });
 

test-suite/test/ui/basic.test.ts

@@ -173,7 +173,7 @@ test.describe('branch/checkpoint/diff/merge', () => {
             await page.locator(`#checkpoint-${mainCheckpointId} .ui-checkbox.tick`).click();
 
             // compare
-            await page.locator('.ui-button.compare:not(.disabled)').click();
+            await page.locator('.pcui-button.compare:not(.pcui-disabled)').click();
 
             // wait for diff to load
             await page.waitForSelector('.picker-conflict-manager.diff');
@@ -207,10 +207,10 @@ test.describe('branch/checkpoint/diff/merge', () => {
             await page.getByText('Merge Into Current Branch').click();
 
             // uncheck checkpoint create
-            await page.locator('div:nth-child(3) > div > div:nth-child(2) > .content > .ui-checkbox').click();
+            await page.locator('.merge-branches .version-control-side-panel-box:last-child .checkpoint-checkbox .tick').click();
 
             // check close branch
-            await page.locator('div:nth-child(3) > .content > .ui-checkbox').first().click();
+            await page.locator('.merge-branches .checkpoint-checkbox').filter({ hasText: 'Close branch' }).locator('.tick').click();
 
             // create merge
             await page.getByText('START MERGE').click();
@@ -244,7 +244,7 @@ test.describe('branch/checkpoint/diff/merge', () => {
             await page.getByText('Merge Into Current Branch').click();
 
             // uncheck checkpoint create
-            await page.locator('div:nth-child(3) > div > div:nth-child(2) > .content > .ui-checkbox').click();
+            await page.locator('.merge-branches .version-control-side-panel-box:last-child .checkpoint-checkbox .tick').click();
 
             // create merge
             await page.getByText('START MERGE').click();
@@ -304,7 +304,7 @@ test.describe('branch/checkpoint/diff/merge', () => {
             await page.locator('.pcui-menu-item').filter({ hasText: /^Restore$/ }).first().click();
 
             // uncheck checkpoint create
-            await page.locator('.content > div:nth-child(2) > .content > .ui-checkbox').first().click();
+            await page.locator('.restore-checkpoint .checkpoint-checkbox .tick').click();
 
             // restore checkpoint
             await page.getByText('Restore Checkpoint', { exact: true }).click();