tests: use solara/pytest-ipywidgets to test image and contour

.github/workflows/ci_tests.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install twine wheel jupyter-packaging jupyterlab
+          pip install twine wheel jupyter-packaging "jupyterlab<4"
 
       - name: Build
         run: |
@@ -50,12 +50,6 @@ jobs:
           name: bqplot-image-gl-dist-${{ github.run_number }}
           path: ./dist
 
-      - name: Install node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '18.x'
-          registry-url: 'https://registry.npmjs.org'
-
       - name: Install Python
         uses: actions/setup-python@v2
         with:
@@ -66,38 +60,23 @@ jobs:
           echo $PWD
           ls -al .
           ls -al dist/
-          pip install dist/bqplot_image_gl*.whl jupyterlab
+          pip install dist/bqplot_image_gl*.whl "pytest-ipywidgets[all]"
 
-      - name: Install Galata
+      - name: Install playwright
         run: |
-          yarn install
-          yarn playwright install chromium
-        working-directory: ui-tests
-
-      - name: Launch JupyterLab
-        run: yarn run start:detached
-        working-directory: ui-tests
+          playwright install chromium
 
-      - name: Wait for JupyterLab
-        uses: ifaxity/wait-on-action@v1
-        with:
-          resource: http-get://localhost:8988/api
-          timeout: 20000
-
-      - name: Run UI Tests
-        env:
-          TARGET_URL: http://127.0.0.1:8988
-        run: yarn run test
-        working-directory: ui-tests
+      - name: Run visual regression tests
+        run: |
+          pytest tests/ui
 
       - name: Upload UI Test artifacts
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: ui-test-output
+          name: bqplot-image-gl-ui-test-output
           path: |
-            ui-tests/playwright-report
-            ui-tests/test-results
+            test-results
 
   tests:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1

tests/ui/contour_test.py

@@ -0,0 +1,38 @@
+import ipywidgets as widgets
+import playwright.sync_api
+from IPython.display import display
+import numpy as np
+from bqplot import Figure, LinearScale, Axis, ColorScale
+from bqplot_image_gl import ImageGL, Contour
+
+
+def test_widget_image(solara_test, page_session: playwright.sync_api.Page, assert_solara_snapshot):
+
+    scale_x = LinearScale(min=0, max=1)
+    scale_y = LinearScale(min=0, max=1)
+    scales = {"x": scale_x, "y": scale_y}
+    axis_x = Axis(scale=scale_x, label="x")
+    axis_y = Axis(scale=scale_y, label="y", orientation="vertical")
+
+    figure = Figure(scales=scales, axes=[axis_x, axis_y])
+
+    scales_image = {"x": scale_x, "y": scale_y, "image": ColorScale(min=0, max=2)}
+
+    x = np.linspace(0, 1, 128)
+    y = np.linspace(0, 1, 256)
+    X, Y = np.meshgrid(x, y)
+    data = 5. * np.sin(2 * np.pi * (X + Y**2))
+
+    image = ImageGL(image=data, scales=scales_image)
+    contour = Contour(image=image, level=[2, 4], scales=scales_image)
+
+
+    figure.marks = (image, contour)
+
+    display(figure)
+
+
+    svg = page_session.locator(".bqplot")
+    svg.wait_for()
+    # page_session.wait_for_timeout(1000)
+    assert_solara_snapshot(svg.screenshot())

tests/ui/image_test.py

@@ -0,0 +1,35 @@
+import ipywidgets as widgets
+import playwright.sync_api
+from IPython.display import display
+
+
+
+def test_widget_image(ipywidgets_runner, page_session: playwright.sync_api.Page, assert_solara_snapshot):
+
+    def kernel_code():
+        import numpy as np
+        from bqplot import Figure, LinearScale, Axis, ColorScale
+        from bqplot_image_gl import ImageGL
+        scale_x = LinearScale(min=0, max=1)
+        scale_y = LinearScale(min=0, max=1)
+        scales = {"x": scale_x, "y": scale_y}
+        axis_x = Axis(scale=scale_x, label="x")
+        axis_y = Axis(scale=scale_y, label="y", orientation="vertical")
+
+        figure = Figure(scales=scales, axes=[axis_x, axis_y])
+
+        scales_image = {"x": scale_x, "y": scale_y, "image": ColorScale(min=0, max=2)}
+
+        data = np.array([[0., 1.], [2., 3.]])
+        image = ImageGL(image=data, scales=scales_image)
+
+        figure.marks = (image,)
+
+        display(figure)
+
+    ipywidgets_runner(kernel_code)
+    svg = page_session.locator(".bqplot")
+    svg.wait_for()
+    # make sure the image is rendered
+    page_session.wait_for_timeout(100)
+    assert_solara_snapshot(svg.screenshot())

tox.ini

@@ -11,11 +11,11 @@ changedir =
 deps =
     test: pytest
     test: pytest-cov
-    test: notebook
+    test: notebook<7
     notebooks: numpy
     notebooks: ipyvuetify
     notebooks: scikit-image
-    notebooks: notebook
+    notebooks: notebook<7
     # NOTE: the following is a temporary fix for the issue described in
     # https://github.com/voila-dashboards/voila/issues/728
     # and should be removed once the issue is fixed in jupyter-server