Running query tests in browser

.circleci/config.yml

@@ -188,14 +188,14 @@ jobs:
     steps:
       - attach_workspace:
           at: .
-      - run: npm run test-unit
+      - run: yarn run test-unit
 
   test-render:
     <<: *defaults
     steps:
       - attach_workspace:
           at: .
-      - run: npm run test-render
+      - run: yarn run test-render
       - store_artifacts:
           path: "test/integration/render-tests/index.html"
 
@@ -204,7 +204,9 @@ jobs:
     steps:
       - attach_workspace:
           at: .
-      - run: npm run test-query
+      - run: yarn run test-query
+      - store_test_results:
+          path: test/integration/query-tests
       - store_artifacts:
           path: "test/integration/query-tests/index.html"
 

.gitignore

@@ -17,6 +17,9 @@ test/integration/**/index*.html
 test/integration/**/actual.png
 test/integration/**/actual.json
 test/integration/**/diff.png
+test/integration/**/test-results.xml
+test/integration/dist/**/*.js
+test/integration/dist/**/*.json
 .eslintcache
 src/style-spec/dist/index.js
 _batfish_site

build/test/build-tape.js

@@ -0,0 +1,18 @@
+/* eslint-disable import/no-commonjs */
+/* eslint-disable flowtype/require-valid-file-annotation */
+const browserify = require('browserify');
+const fs = require('fs');
+
+module.exports = function() {
+    return new Promise((resolve, reject) => {
+        browserify(require.resolve('../../test/util/tape_config.js'), { standalone: 'tape' })
+            .bundle((err, buff) => {
+                if (err) { throw err; }
+
+                fs.writeFile('test/integration/dist/tape.js', buff, { encoding: 'utf8'}, (err) => {
+                    if (err) { reject(err); }
+                    resolve();
+                });
+            });
+    });
+};

debug/2762.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/../debug/../debug/access_token_generated.js'></script>
 <script>
 
 var map = new mapboxgl.Map({

debug/3895.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/7438.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/7517.html

@@ -11,7 +11,7 @@
             margin: 0;
             padding: 0;
         }
-        
+
         html,
         body,
         #map {
@@ -24,7 +24,7 @@
     <div id='map'></div>
 
     <script src='../dist/mapbox-gl-dev.js'></script>
-    <script src='access_token_generated.js'></script>
+    <script src='../debug/access_token_generated.js'></script>
     <script>
         const data = {
             'type': 'Feature',

debug/animate.html

@@ -14,7 +14,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/bounds.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
     var map = window.map = new mapboxgl.Map({
         container: 'map',

debug/cache_api.html

@@ -18,7 +18,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 const CACHE_NAME = 'mapbox-tiles';

debug/canvas.html

@@ -18,7 +18,7 @@
 </canvas>
 <div id='map'></div>
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 function drawToCanvas() {

debug/chinese.html

@@ -25,7 +25,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/circles.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/cluster.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/color_spaces.html

@@ -30,7 +30,7 @@
 </div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/csp-static.html

@@ -18,7 +18,7 @@
 <div id='map'></div>
 
 <script src='/dist/mapbox-gl-csp.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script nonce="app-js">
 
 mapboxgl.workerUrl = '/dist/mapbox-gl-csp-worker.js';

debug/csp.html

@@ -16,7 +16,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script nonce="dummy">
 
 var map = window.map = new mapboxgl.Map({

debug/custom3d.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/debug.html

@@ -29,7 +29,7 @@
 </div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/events.html

@@ -95,7 +95,7 @@
 <div id='console' class='hide'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 
 <script>
 var map = window.map = new mapboxgl.Map({

debug/extrusion-query.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/heatmap.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/highlightpoints.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/hillshade.html

@@ -61,7 +61,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = new mapboxgl.Map({

debug/iframe-blob.html

@@ -12,7 +12,7 @@
 <script>
 const mapboxgl = {};
 </script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 const js = document.createElement("a");
 js.href = "../dist/mapbox-gl-dev.js";

debug/image.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var imageStyle = {

debug/index.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/line-gradient.html

@@ -15,7 +15,7 @@
     <div id='map'></div>
 
     <script src='../dist/mapbox-gl-dev.js'></script>
-    <script src='access_token_generated.js'></script>
+    <script src='../debug/access_token_generated.js'></script>
     <script>
     var map = window.map = new mapboxgl.Map({
         container: 'map',

debug/markers.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/mobile_scroll.html

@@ -16,7 +16,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/multiple.html

@@ -18,7 +18,7 @@
 <div class='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var style = {

debug/no_wrap.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/popup.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/query_features.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = new mapboxgl.Map({

debug/raster-streets.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/satellite.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/setstyle.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script src='/debug/dark-v9.js'></script>
 <script src='/debug/light-v9.js'></script>
 <script>

debug/textsize.html

@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 var stops = [
     [ 0, 6 ],

debug/threejs.html

@@ -16,7 +16,7 @@
 
 <script src='../dist/mapbox-gl-dev.js'></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/94/three.min.js"></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 var map = window.map = new mapboxgl.Map({

debug/tinysdf.html

@@ -48,7 +48,7 @@
 </div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
-<script src='access_token_generated.js'></script>
+<script src='../debug/access_token_generated.js'></script>
 <script>
 
 function localizeLayers(map) {