circleci: ⚡ test-image-gl2d, reintroduce sorting of gl2d mocks

Author: antoinerg

package.json

@@ -38,7 +38,7 @@
     "test-export": "node tasks/test_export.js",
     "test-syntax": "node tasks/test_syntax.js && npm run find-strings -- --no-output",
     "test-bundle": "node tasks/test_bundle.js",
-    "test": "npm run test-jasmine && npm run test-bundle && npm run test-image && npm run test-image-gl2d && npm run test-syntax && npm run lint",
+    "test": "npm run test-jasmine -- --nowatch && npm run test-bundle && npm run test-image && npm run test-export && npm run test-syntax && npm run lint",
     "start-test_dashboard": "node devtools/test_dashboard/server.js",
     "start-image_viewer": "node devtools/image_viewer/server.js",
     "start": "npm run start-test_dashboard",

test/image/compare_pixels_test.js

@@ -73,12 +73,10 @@ argv._.forEach(function(pattern) {
 });
 
 // To get rid of duplicates
-Array.prototype.unique = function() {
-    return this.filter(function(value, index, self) {
-        return self.indexOf(value) === index;
-    });
-};
-allMockList = allMockList.unique();
+function unique(value, index, self) {
+    return self.indexOf(value) === index;
+}
+allMockList = allMockList.filter(unique);
 
 // filter out untestable mocks if no pattern is specified (ie. we're testing all mocks)
 // or if flag '--filter' is provided
@@ -88,6 +86,8 @@ if(allMock || filter) {
     console.log('\n');
 }
 
+sortGl2dMockList(allMockList);
+
 // main
 if(isInQueue) {
     runInQueue(allMockList);
@@ -99,9 +99,7 @@ else {
 /* Test cases:
  *
  * - font-wishlist
- * - all gl2d
  * - all mapbox
- * - gl3d_cone-*
  *
  * don't behave consistently from run-to-run and/or
  * machine-to-machine; skip over them for now.
@@ -110,7 +108,6 @@ else {
 function untestableFilter(mockName) {
     var cond = !(
         mockName === 'font-wishlist' ||
-        // mockName.indexOf('gl2d_') !== -1 ||
         mockName.indexOf('mapbox_') !== -1
     );
 
@@ -119,6 +116,34 @@ function untestableFilter(mockName) {
     return cond;
 }
 
+/* gl2d pointcloud and other non-regl gl2d mock(s)
+ * must be tested first on in order to work;
+ * sort them here.
+ *
+ * gl-shader appears to conflict with regl.
+ * We suspect that the lone gl context on CircleCI is
+ * having issues with dealing with the two different
+ * program binding algorithm.
+ *
+ * The problem will be solved by switching all our
+ * WebGL-based trace types to regl.
+ *
+ * More info here:
+ * https://github.com/plotly/plotly.js/pull/1037
+ */
+function sortGl2dMockList(mockList) {
+    var mockNames = ['gl2d_pointcloud-basic', 'gl2d_heatmapgl'];
+    var pos = 0;
+
+    mockNames.forEach(function(m) {
+        var ind = mockList.indexOf(m);
+        var tmp = mockList[pos];
+        mockList[pos] = m;
+        mockList[ind] = tmp;
+        pos++;
+    });
+}
+
 function runInBatch(mockList) {
     var running = 0;