Merge pull request #8 from martinRenou/ui-tests

UI testing with Galata

Author: martinRenou

.github/workflows/build.yml

@@ -85,6 +85,31 @@ jobs:
     - name: JavaScript prettyfier
       run: yarn run prettier:check
 
+    - name: Install Galata
+      run: yarn install
+      working-directory: ui-tests
+
+    - name: Launch JupyterLab
+      run: yarn run start-jlab:detached
+      working-directory: ui-tests
+
+    - name: Wait for JupyterLab
+      uses: ifaxity/wait-on-action@v1
+      with:
+        resource: http-get://localhost:8888/api
+        timeout: 20000
+
+    - name: Run UI Tests
+      run: yarn run test
+      working-directory: ui-tests
+
+    - name: Upload UI Test artifacts
+      if: always()
+      uses: actions/upload-artifact@v2
+      with:
+        name: ui-test-output
+        path: ui-tests/test-output
+
     # - name: JavaScript tests
     #   run: yarn run test
     #   working-directory: js
@@ -106,58 +131,6 @@ jobs:
         name: dist ${{ github.run_number }}
         path: ./dist
 
-# visual-regression-tests:
-#   runs-on: ubuntu-latest
-#   needs: [build]
-
-#   steps:
-#     - name: Checkout
-#       uses: actions/checkout@v2
-
-#     - name: Setup conda
-#       uses: conda-incubator/setup-miniconda@v2
-#       with:
-#         activate-environment: bqplot-test
-#         environment-file: test-environment.yml
-#         python-version: 3.9
-#         mamba-version: "*"
-#         auto-activate-base: false
-#         channels: conda-forge
-
-#     - uses: actions/download-artifact@v2
-#       with:
-#         name: dist ${{ github.run_number }}
-#         path: ./dist
-
-#     - name: Install the package
-#       run: pip install -vv bqplot*.whl
-#       working-directory: dist
-
-#     - name: Install Galata
-#       run: yarn install
-#       working-directory: ui-tests
-
-#     - name: Launch JupyterLab
-#       run: yarn run start-jlab:detached
-#       working-directory: ui-tests
-
-#     - name: Wait for JupyterLab
-#       uses: ifaxity/wait-on-action@v1
-#       with:
-#         resource: http-get://localhost:8888/api
-#         timeout: 20000
-
-#     - name: Run UI Tests
-#       run: yarn run test
-#       working-directory: ui-tests
-
-#     - name: Upload UI Test artifacts
-#       if: always()
-#       uses: actions/upload-artifact@v2
-#       with:
-#         name: ui-test-output
-#         path: ui-tests/test-output
-
   install:
     runs-on: ${{ matrix.os }}-latest
     needs: [build]

.gitignore

@@ -154,3 +154,5 @@ bqplot_gl/labextension/*.tgz
 
 # Packed lab extensions
 bqplot_gl/labextension
+
+ui-tests/test-output/*

babel.config.js

@@ -9,5 +9,6 @@ module.exports = {
         },
       },
     ],
+    '@babel/preset-typescript',
   ],
 };

bqplot_gl/_version.py

@@ -4,5 +4,5 @@
 # Copyright (c) The bqplot Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-version_info = (0, 1, 0, 'dev')
+version_info = (0, 1, 0)
 __version__ = ".".join(map(str, version_info))

package.json

@@ -61,6 +61,7 @@
   "devDependencies": {
     "@babel/core": "^7.5.0",
     "@babel/preset-env": "^7.5.0",
+    "@babel/preset-typescript": "^7.15.0",
     "@jupyterlab/builder": "^3.0.0",
     "@phosphor/application": "^1.6.0",
     "@phosphor/widgets": "^1.6.0",

src/ScatterGLView.ts

@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 
+import { ColorScale } from 'bqscales';
 import { Mark, symbol as bqSymbol, deepCopy, Scale } from 'bqplot';
 import * as d3 from 'd3';
 import * as _ from 'underscore';
@@ -56,9 +57,9 @@ const color_to_array_rgba = function (color: any, default_color?: any) {
   }
 };
 
-const create_colormap = function (scale: any) {
+const create_colormap = function (scale: ColorScale) {
   // convert the d3 color scale to a texture
-  const colors = scale ? scale.model.color_range : ['#ff0000', '#ff0000'];
+  const colors = scale ? scale.model.colorRange : [0, 1];
   const color_scale = d3
     .scaleLinear()
     .range(colors)

src/plugin.ts

@@ -7,7 +7,7 @@ import { Widget } from '@phosphor/widgets';
 
 import { IJupyterWidgetRegistry } from '@jupyter-widgets/base';
 
-import * as widgetExports from './figure';
+import * as widgetExports from './index';
 
 import { MODULE_NAME, MODULE_VERSION } from './version';
 

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "esModuleInterop":true,
+    "esModuleInterop": true,
     "lib": ["es2015", "dom"],
     "module": "commonjs",
     "moduleResolution": "node",

ui-tests/README.md

@@ -0,0 +1,3 @@
+{
+  "testId": "test"
+}