Fix ui-tests

Author: fcollonval

ui-tests/tests/jupyterlab-unfold.spec.ts

@@ -11,68 +11,112 @@ function item(name: string) {
 
 test.describe.serial('jupyterlab-unfold', () => {
   test('should unfold', async ({ page }) => {
+    let workspace = { data: {}, metadata: { id: 'default' } };
+    await page.route(/.*\/api\/workspaces.*/, (route, request) => {
+      if (request.method() === 'GET') {
+        route.fulfill({
+          status: 200,
+          body: JSON.stringify(workspace)
+        });
+      } else if (request.method() === 'PUT') {
+        workspace = request.postDataJSON();
+        route.fulfill({ status: 204 });
+      } else {
+        route.continue();
+      }
+    });
+
     await page.goto(`${TARGET_URL}/lab`);
     await page.waitForSelector('#jupyterlab-splash', { state: 'detached' });
     await page.waitForSelector('div[role="main"] >> text=Launcher');
 
     // Let time for JupyterLab to finish rendering
-    await page.waitForTimeout(2000);
+    await page.hover(item('dir1'));
 
-    expect(
-      await page.locator(TREE_LOCATOR).screenshot()
-    ).toMatchSnapshot('first-render.png');
+    expect(await page.locator(TREE_LOCATOR).screenshot()).toMatchSnapshot(
+      'first-render.png'
+    );
 
     await page.click(item('dir1'));
     await page.waitForSelector(item('dir2'));
 
-    expect(
-      await page.locator(TREE_LOCATOR).screenshot()
-    ).toMatchSnapshot('unfold-dir1.png');
+    expect(await page.locator(TREE_LOCATOR).screenshot()).toMatchSnapshot(
+      'unfold-dir1.png'
+    );
 
     await page.click(item('dir2'));
     await page.waitForSelector(item('dir3'));
 
-    expect(
-      await page.locator(TREE_LOCATOR).screenshot()
-    ).toMatchSnapshot('unfold-dir2.png');
+    expect(await page.locator(TREE_LOCATOR).screenshot()).toMatchSnapshot(
+      'unfold-dir2.png'
+    );
 
     await page.click(item('dir3'));
     await page.waitForSelector(item('file211.txt'));
 
-    expect(
-      await page.locator(TREE_LOCATOR).screenshot()
-    ).toMatchSnapshot('unfold-dir3.png');
+    expect(await page.locator(TREE_LOCATOR).screenshot()).toMatchSnapshot(
+      'unfold-dir3.png'
+    );
 
     await page.click(item('dir2'));
     await page.waitForSelector(item('dir3'), { state: 'detached' });
 
-    expect(
-      await page.locator(TREE_LOCATOR).screenshot()
-    ).toMatchSnapshot('fold-dir2.png');
-
-    await page.click(item('dir2'));
+    expect(await page.locator(TREE_LOCATOR).screenshot()).toMatchSnapshot(
+      'fold-dir2.png'
+    );
+
+    await Promise.all([
+      page.waitForResponse(
+        response =>
+          response.request().method() === 'PUT' &&
+          response.status() === 204 &&
+          response.url().includes('api/workspaces')
+      ),
+      page.click(item('dir2'))
+    ]);
     await page.waitForSelector(item('dir3'));
 
-    expect(
-      await page.locator(TREE_LOCATOR).screenshot()
-    ).toMatchSnapshot('unfold-dir2-2.png');
+    expect(await page.locator(TREE_LOCATOR).screenshot()).toMatchSnapshot(
+      'unfold-dir2-2.png'
+    );
   });
 
-
   test('should open file', async ({ page }) => {
+    let workspace = {
+      data: {
+        'file-browser-jupyterlab-unfold:openState': {
+          openState: { '.': true, dir1: true, dir2: true, 'dir2/dir3': true }
+        }
+      },
+      metadata: { id: 'default' }
+    };
+    await page.route(/.*\/api\/workspaces.*/, (route, request) => {
+      if (request.method() === 'GET') {
+        route.fulfill({
+          status: 200,
+          body: JSON.stringify(workspace)
+        });
+      } else if (request.method() === 'PUT') {
+        workspace = request.postDataJSON();
+        route.fulfill({ status: 204 });
+      } else {
+        route.continue();
+      }
+    });
+
     await page.goto(`${TARGET_URL}/lab`);
     await page.waitForSelector('#jupyterlab-splash', { state: 'detached' });
     await page.waitForSelector('div[role="main"] >> text=Launcher');
 
     // Let time for JupyterLab to finish rendering
-    await page.waitForTimeout(2000);
+    await page.hover(item('dir1'));
 
     await page.dblclick(item('file211.txt'));
-    // TODO Use something more reliable
-    await page.waitForTimeout(1000);
 
-    expect(
-      await page.locator(TABS_LOCATOR).screenshot()
-    ).toMatchSnapshot('open-file211.png');
+    await page.waitForSelector('[role="main"] >> text=file211.txt');
+
+    expect(await page.locator(TABS_LOCATOR).screenshot()).toMatchSnapshot(
+      'open-file211.png'
+    );
   });
 });