mv gl3d_cone-* out of npm run test-image into noci_test.sh

.. so that we test gl3d_cone-* mocks using orca, not our old nw.js imagetest container which doesn't generate cones properly for some reason.
plotly · May 17, 2018 · aaf7249 · aaf7249
1 parent 3f3bfac
commit aaf7249
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/tasks/noci_test.sh b/tasks/noci_test.sh
@@ -13,8 +13,11 @@ npm run test-jasmine -- --tags=noCI --nowatch || EXIT_STATE=$?
 # since the update to mapbox-gl@0.44.0, we must use orca
 # as mapbox-gl versions >0.22.1 aren't supported on nw.js@0.12 used in the
 # 'old' image server
+#
+# cone traces don't render correctly in the imagetest container
 $root/../orca/bin/orca.js graph \
     $root/test/image/mocks/mapbox_* \
+    $root/test/image/mocks/gl3d_cone* \
     --plotly $root/build/plotly.js \
     --mapbox-access-token "pk.eyJ1IjoiZXRwaW5hcmQiLCJhIjoiY2luMHIzdHE0MGFxNXVubTRxczZ2YmUxaCJ9.hwWZful0U2CQxit4ItNsiQ" \
     --output-dir $root/test/image/baselines/ \

diff --git a/test/image/baselines/gl3d_cone-simple.png b/test/image/baselines/gl3d_cone-simple.png
diff --git a/test/image/baselines/gl3d_cone-sparse.png b/test/image/baselines/gl3d_cone-sparse.png
diff --git a/test/image/baselines/gl3d_cone-wind.png b/test/image/baselines/gl3d_cone-wind.png
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
@@ -86,6 +86,7 @@ else {
  * - 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.
@@ -95,7 +96,8 @@ function untestableFilter(mockName) {
     var cond = !(
         mockName === 'font-wishlist' ||
         mockName.indexOf('gl2d_') !== -1 ||
-        mockName.indexOf('mapbox_') !== -1
+        mockName.indexOf('mapbox_') !== -1 ||
+        mockName.indexOf('gl3d_cone-') !== -1
     );
 
     if(!cond) console.log(' -', mockName);

diff --git a/test/image/mocks/gl3d_cone-simple.json b/test/image/mocks/gl3d_cone-simple.json
@@ -38,6 +38,7 @@
     },
     "scene2": {
       "domain": {"x": [0.5, 1]}
-    }
+    },
+    "width": 800
   }
 }