From e08b935208618509f2e478a2c0d589def81ad2d7 Mon Sep 17 00:00:00 2001 From: Anand Thakker Date: Tue, 27 Feb 2018 16:20:05 -0500 Subject: [PATCH] [codemod] Convert test/unit to use import instead of require 5to6 cjs transform --- test/unit/data/dem_data.test.js | 10 ++--- test/unit/data/fill_bucket.test.js | 18 ++++----- test/unit/data/line_bucket.test.js | 18 ++++----- test/unit/data/load_geometry.test.js | 12 +++--- test/unit/data/symbol_bucket.test.js | 32 ++++++++-------- test/unit/data/vertex_buffer.test.js | 8 ++-- test/unit/geo/coordinate.test.js | 4 +- test/unit/geo/lng_lat.test.js | 4 +- test/unit/geo/lng_lat_bounds.test.js | 6 +-- test/unit/geo/transform.test.js | 13 +++---- test/unit/gl/state.test.js | 38 +++---------------- test/unit/mapbox-gl.js | 4 +- test/unit/render/glyph_manager.test.js | 8 ++-- test/unit/shaders/encode_attribute.test.js | 4 +- test/unit/source/canvas_source.test.js | 12 +++--- test/unit/source/geojson_source.test.js | 14 +++---- .../unit/source/geojson_worker_source.test.js | 10 ++--- test/unit/source/geojson_wrapper.test.js | 4 +- test/unit/source/image_source.test.js | 14 +++---- test/unit/source/query_features.test.js | 6 +-- .../source/raster_dem_tile_source.test.js | 8 ++-- .../raster_dem_tile_worker_source.test.js | 8 ++-- test/unit/source/raster_tile_source.test.js | 8 ++-- test/unit/source/source_cache.test.js | 22 +++++------ test/unit/source/tile.test.js | 24 ++++++------ test/unit/source/tile_id.test.js | 4 +- test/unit/source/tile_mask.test.js | 6 +-- test/unit/source/vector_tile_source.test.js | 10 ++--- .../source/vector_tile_worker_source.test.js | 16 ++++---- test/unit/source/worker.test.js | 6 +-- test/unit/source/worker_tile.test.js | 12 +++--- test/unit/style-spec/color.js | 4 +- test/unit/style-spec/composite.test.js | 4 +- test/unit/style-spec/convert_function.test.js | 4 +- test/unit/style-spec/declass.test.js | 4 +- test/unit/style-spec/deref.test.js | 4 +- test/unit/style-spec/diff.test.js | 4 +- test/unit/style-spec/expression.test.js | 4 +- test/unit/style-spec/feature_filter.test.js | 4 +- test/unit/style-spec/format.test.js | 4 +- test/unit/style-spec/function.test.js | 6 +-- test/unit/style-spec/group_by_layout.test.js | 4 +- test/unit/style-spec/interpolate.test.js | 6 +-- test/unit/style-spec/migrate.test.js | 16 ++++---- test/unit/style-spec/migrate/v8.js | 4 +- test/unit/style-spec/migrate/v9.js | 4 +- test/unit/style-spec/spec.test.js | 4 +- .../unit/style-spec/util/color_spaces.test.js | 6 +-- test/unit/style-spec/validate.test.js | 12 +++--- test/unit/style/light.test.js | 10 ++--- test/unit/style/load_glyph_range.test.js | 4 +- test/unit/style/style.test.js | 24 ++++++------ test/unit/style/style_layer.test.js | 10 ++--- test/unit/style/style_layer_index.test.js | 6 +-- test/unit/symbol/anchor.test.js | 4 +- test/unit/symbol/check_max_angle.test.js | 8 ++-- test/unit/symbol/collision_feature.js | 10 ++--- test/unit/symbol/cross_tile_symbol_index.js | 8 ++-- test/unit/symbol/get_anchors.test.js | 6 +-- test/unit/symbol/grid_index.test.js | 5 +-- test/unit/symbol/mergelines.test.js | 6 +-- test/unit/symbol/quads.test.js | 9 ++--- test/unit/symbol/shaping.test.js | 8 ++-- test/unit/ui/camera.test.js | 11 +++--- test/unit/ui/control/attribution.test.js | 10 ++--- test/unit/ui/control/fullscreen.test.js | 8 ++-- test/unit/ui/control/geolocate.test.js | 10 ++--- test/unit/ui/control/logo.test.js | 8 ++-- test/unit/ui/handler/box_zoom.test.js | 10 ++--- test/unit/ui/handler/dblclick_zoom.test.js | 10 ++--- test/unit/ui/handler/drag_pan.test.js | 10 ++--- test/unit/ui/handler/drag_rotate.test.js | 12 +++--- test/unit/ui/handler/scroll_zoom.test.js | 14 +++---- .../unit/ui/handler/touch_zoom_rotate.test.js | 10 ++--- test/unit/ui/hash.test.js | 8 ++-- test/unit/ui/map.test.js | 19 +++++----- test/unit/ui/map/isMoving.test.js | 12 +++--- test/unit/ui/map/isRotating.test.js | 10 ++--- test/unit/ui/map/isZooming.test.js | 12 +++--- test/unit/ui/map_events.test.js | 8 ++-- test/unit/ui/marker.test.js | 14 +++---- test/unit/ui/popup.test.js | 14 +++---- test/unit/util/actor.test.js | 6 +-- test/unit/util/ajax.test.js | 6 +-- test/unit/util/browser.test.js | 4 +- test/unit/util/classify_rings.test.js | 12 +++--- test/unit/util/dispatcher.test.js | 8 ++-- test/unit/util/evented.test.js | 4 +- .../util/find_pole_of_inaccessibility.test.js | 6 +-- test/unit/util/lru_cache.test.js | 4 +- test/unit/util/mapbox.test.js | 10 ++--- test/unit/util/struct_array.test.js | 4 +- test/unit/util/throttle.test.js | 6 ++- test/unit/util/tile_cover.test.js | 6 +-- test/unit/util/token.test.js | 4 +- test/unit/util/util.test.js | 10 +++-- test/unit/util/web_worker_transfer.test.js | 7 +--- test/unit/util/worker_pool.test.js | 4 +- 98 files changed, 429 insertions(+), 461 deletions(-) diff --git a/test/unit/data/dem_data.test.js b/test/unit/data/dem_data.test.js index 74e12f59d6f..a96e1ca02f0 100644 --- a/test/unit/data/dem_data.test.js +++ b/test/unit/data/dem_data.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const util = require('../../../src/util/util'); -const {DEMData, Level} = require('../../../src/data/dem_data'); -const {RGBAImage} = require('../../../src/util/image'); -const {serialize, deserialize} = require('../../../src/util/web_worker_transfer'); +import { test } from 'mapbox-gl-js-test'; +import util from '../../../src/util/util'; +import { DEMData, Level } from '../../../src/data/dem_data'; +import { RGBAImage } from '../../../src/util/image'; +import { serialize, deserialize } from '../../../src/util/web_worker_transfer'; function createMockImage(height, width) { const pixels = new Uint8Array(height * width * 4); diff --git a/test/unit/data/fill_bucket.test.js b/test/unit/data/fill_bucket.test.js index d7c17464656..ffbba4e19a5 100644 --- a/test/unit/data/fill_bucket.test.js +++ b/test/unit/data/fill_bucket.test.js @@ -1,14 +1,14 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const fs = require('fs'); -const path = require('path'); -const Protobuf = require('pbf'); -const VectorTile = require('@mapbox/vector-tile').VectorTile; -const Point = require('@mapbox/point-geometry'); -const segment = require('../../../src/data/segment'); -const FillBucket = require('../../../src/data/bucket/fill_bucket'); -const FillStyleLayer = require('../../../src/style/style_layer/fill_style_layer'); +import { test } from 'mapbox-gl-js-test'; +import fs from 'fs'; +import path from 'path'; +import Protobuf from 'pbf'; +import { VectorTile } from '@mapbox/vector-tile'; +import Point from '@mapbox/point-geometry'; +import segment from '../../../src/data/segment'; +import FillBucket from '../../../src/data/bucket/fill_bucket'; +import FillStyleLayer from '../../../src/style/style_layer/fill_style_layer'; // Load a fill feature from fixture tile. const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))); diff --git a/test/unit/data/line_bucket.test.js b/test/unit/data/line_bucket.test.js index 574bdacdf4f..7f2ec757f9c 100644 --- a/test/unit/data/line_bucket.test.js +++ b/test/unit/data/line_bucket.test.js @@ -1,14 +1,14 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const fs = require('fs'); -const path = require('path'); -const Protobuf = require('pbf'); -const VectorTile = require('@mapbox/vector-tile').VectorTile; -const Point = require('@mapbox/point-geometry'); -const segment = require('../../../src/data/segment'); -const LineBucket = require('../../../src/data/bucket/line_bucket'); -const LineStyleLayer = require('../../../src/style/style_layer/line_style_layer'); +import { test } from 'mapbox-gl-js-test'; +import fs from 'fs'; +import path from 'path'; +import Protobuf from 'pbf'; +import { VectorTile } from '@mapbox/vector-tile'; +import Point from '@mapbox/point-geometry'; +import segment from '../../../src/data/segment'; +import LineBucket from '../../../src/data/bucket/line_bucket'; +import LineStyleLayer from '../../../src/style/style_layer/line_style_layer'; // Load a line feature from fixture tile. const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))); diff --git a/test/unit/data/load_geometry.test.js b/test/unit/data/load_geometry.test.js index 624f69ba14f..dead9ed177c 100644 --- a/test/unit/data/load_geometry.test.js +++ b/test/unit/data/load_geometry.test.js @@ -1,11 +1,11 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const fs = require('fs'); -const path = require('path'); -const Protobuf = require('pbf'); -const VectorTile = require('@mapbox/vector-tile').VectorTile; -const loadGeometry = require('../../../src/data/load_geometry.js'); +import { test } from 'mapbox-gl-js-test'; +import fs from 'fs'; +import path from 'path'; +import Protobuf from 'pbf'; +import { VectorTile } from '@mapbox/vector-tile'; +import loadGeometry from '../../../src/data/load_geometry.js'; // Load a line feature from fixture tile. const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))); diff --git a/test/unit/data/symbol_bucket.test.js b/test/unit/data/symbol_bucket.test.js index 7b90bfe58da..25dc0393567 100644 --- a/test/unit/data/symbol_bucket.test.js +++ b/test/unit/data/symbol_bucket.test.js @@ -1,21 +1,21 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const fs = require('fs'); -const path = require('path'); -const Protobuf = require('pbf'); -const VectorTile = require('@mapbox/vector-tile').VectorTile; -const SymbolBucket = require('../../../src/data/bucket/symbol_bucket'); -const {CollisionBoxArray} = require('../../../src/data/array_types'); -const SymbolStyleLayer = require('../../../src/style/style_layer/symbol_style_layer'); -const util = require('../../../src/util/util'); -const featureFilter = require('../../../src/style-spec/feature_filter'); -const {performSymbolLayout} = require('../../../src/symbol/symbol_layout'); -const Placement = require('../../../src/symbol/placement'); -const Transform = require('../../../src/geo/transform'); -const {OverscaledTileID} = require('../../../src/source/tile_id'); -const Tile = require('../../../src/source/tile'); -const CrossTileSymbolIndex = require('../../../src/symbol/cross_tile_symbol_index'); +import { test } from 'mapbox-gl-js-test'; +import fs from 'fs'; +import path from 'path'; +import Protobuf from 'pbf'; +import { VectorTile } from '@mapbox/vector-tile'; +import SymbolBucket from '../../../src/data/bucket/symbol_bucket'; +import { CollisionBoxArray } from '../../../src/data/array_types'; +import SymbolStyleLayer from '../../../src/style/style_layer/symbol_style_layer'; +import util from '../../../src/util/util'; +import featureFilter from '../../../src/style-spec/feature_filter'; +import { performSymbolLayout } from '../../../src/symbol/symbol_layout'; +import Placement from '../../../src/symbol/placement'; +import Transform from '../../../src/geo/transform'; +import { OverscaledTileID } from '../../../src/source/tile_id'; +import Tile from '../../../src/source/tile'; +import CrossTileSymbolIndex from '../../../src/symbol/cross_tile_symbol_index'; // Load a point feature from fixture tile. const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))); diff --git a/test/unit/data/vertex_buffer.test.js b/test/unit/data/vertex_buffer.test.js index 8e7ca10006b..959ecc02807 100644 --- a/test/unit/data/vertex_buffer.test.js +++ b/test/unit/data/vertex_buffer.test.js @@ -1,9 +1,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const VertexBuffer = require('../../../src/gl/vertex_buffer'); -const {StructArrayLayout3i6} = require('../../../src/data/array_types'); -const Context = require('../../../src/gl/context'); +import { test } from 'mapbox-gl-js-test'; +import VertexBuffer from '../../../src/gl/vertex_buffer'; +import { StructArrayLayout3i6 } from '../../../src/data/array_types'; +import Context from '../../../src/gl/context'; test('VertexBuffer', (t) => { class TestArray extends StructArrayLayout3i6 {} diff --git a/test/unit/geo/coordinate.test.js b/test/unit/geo/coordinate.test.js index cc3565b029e..fc97d4b609f 100644 --- a/test/unit/geo/coordinate.test.js +++ b/test/unit/geo/coordinate.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Coordinate = require('../../../src/geo/coordinate'); +import { test } from 'mapbox-gl-js-test'; +import Coordinate from '../../../src/geo/coordinate'; test('Coordinate', (t) => { t.test('#constructor', (t) => { diff --git a/test/unit/geo/lng_lat.test.js b/test/unit/geo/lng_lat.test.js index 3f96b6c725e..c537f53ce6d 100644 --- a/test/unit/geo/lng_lat.test.js +++ b/test/unit/geo/lng_lat.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const LngLat = require('../../../src/geo/lng_lat'); +import { test } from 'mapbox-gl-js-test'; +import LngLat from '../../../src/geo/lng_lat'; test('LngLat', (t) => { t.test('#constructor', (t) => { diff --git a/test/unit/geo/lng_lat_bounds.test.js b/test/unit/geo/lng_lat_bounds.test.js index d1156cdd3db..2d6fbce2561 100644 --- a/test/unit/geo/lng_lat_bounds.test.js +++ b/test/unit/geo/lng_lat_bounds.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const LngLat = require('../../../src/geo/lng_lat'); -const LngLatBounds = require('../../../src/geo/lng_lat_bounds'); +import { test } from 'mapbox-gl-js-test'; +import LngLat from '../../../src/geo/lng_lat'; +import LngLatBounds from '../../../src/geo/lng_lat_bounds'; test('LngLatBounds', (t) => { t.test('#constructor', (t) => { diff --git a/test/unit/geo/transform.test.js b/test/unit/geo/transform.test.js index dc1681e0e4c..79a7d1784fd 100644 --- a/test/unit/geo/transform.test.js +++ b/test/unit/geo/transform.test.js @@ -1,12 +1,11 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Point = require('@mapbox/point-geometry'); -const Transform = require('../../../src/geo/transform'); -const LngLat = require('../../../src/geo/lng_lat'); -const {OverscaledTileID, CanonicalTileID} = require('../../../src/source/tile_id'); - -const fixed = require('mapbox-gl-js-test/fixed'); +import { test } from 'mapbox-gl-js-test'; +import Point from '@mapbox/point-geometry'; +import Transform from '../../../src/geo/transform'; +import LngLat from '../../../src/geo/lng_lat'; +import { OverscaledTileID, CanonicalTileID } from '../../../src/source/tile_id'; +import fixed from 'mapbox-gl-js-test/fixed'; const fixedLngLat = fixed.LngLat; const fixedCoord = fixed.Coord; diff --git a/test/unit/gl/state.test.js b/test/unit/gl/state.test.js index 3caada9f7fb..c1e814d361c 100644 --- a/test/unit/gl/state.test.js +++ b/test/unit/gl/state.test.js @@ -1,38 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const { - ClearColor, - ClearDepth, - ClearStencil, - ColorMask, - DepthMask, - StencilMask, - StencilFunc, - StencilOp, - StencilTest, - DepthRange, - DepthTest, - DepthFunc, - Blend, - BlendFunc, - BlendColor, - Program, - LineWidth, - ActiveTextureUnit, - Viewport, - BindFramebuffer, - BindRenderbuffer, - BindTexture, - BindVertexBuffer, - BindElementBuffer, - BindVertexArrayOES, - PixelStoreUnpack, - PixelStoreUnpackPremultiplyAlpha -} = require('../../../src/gl/value'); -const Context = require('../../../src/gl/context'); -const Color = require('../../../src/style-spec/util/color'); -const {deepEqual} = require('../../../src/util/util'); +import { test } from 'mapbox-gl-js-test'; +import { ClearColor, ClearDepth, ClearStencil, ColorMask, DepthMask, StencilMask, StencilFunc, StencilOp, StencilTest, DepthRange, DepthTest, DepthFunc, Blend, BlendFunc, BlendColor, Program, LineWidth, ActiveTextureUnit, Viewport, BindFramebuffer, BindRenderbuffer, BindTexture, BindVertexBuffer, BindElementBuffer, BindVertexArrayOES, PixelStoreUnpack, PixelStoreUnpackPremultiplyAlpha } from '../../../src/gl/value'; +import Context from '../../../src/gl/context'; +import Color from '../../../src/style-spec/util/color'; +import { deepEqual } from '../../../src/util/util'; const context = new Context(require('gl')(10, 10)); context.lineWidthRange = [0, 1]; diff --git a/test/unit/mapbox-gl.js b/test/unit/mapbox-gl.js index d47e3b3728f..1b94730d43f 100644 --- a/test/unit/mapbox-gl.js +++ b/test/unit/mapbox-gl.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const mapboxgl = require('../../src'); +import { test } from 'mapbox-gl-js-test'; +import mapboxgl from '../../src'; test('mapboxgl', (t) => { t.test('version', (t) => { diff --git a/test/unit/render/glyph_manager.test.js b/test/unit/render/glyph_manager.test.js index 55d155b24f4..d009dc800b8 100644 --- a/test/unit/render/glyph_manager.test.js +++ b/test/unit/render/glyph_manager.test.js @@ -2,10 +2,10 @@ 'use strict'; -const {test} = require('mapbox-gl-js-test'); -const proxyquire = require('proxyquire'); -const parseGlyphPBF = require('../../../src/style/parse_glyph_pbf'); -const fs = require('fs'); +import { test } from 'mapbox-gl-js-test'; +import proxyquire from 'proxyquire'; +import parseGlyphPBF from '../../../src/style/parse_glyph_pbf'; +import fs from 'fs'; const glyphs = {}; for (const glyph of parseGlyphPBF(fs.readFileSync('./test/fixtures/0-255.pbf'))) { diff --git a/test/unit/shaders/encode_attribute.test.js b/test/unit/shaders/encode_attribute.test.js index dcf4d82d12b..4a3d7511f5f 100644 --- a/test/unit/shaders/encode_attribute.test.js +++ b/test/unit/shaders/encode_attribute.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const encode = require('../../../src/shaders/encode_attribute'); +import { test } from 'mapbox-gl-js-test'; +import encode from '../../../src/shaders/encode_attribute'; test('packUint8ToFloat', (t) => { t.equal(encode.packUint8ToFloat(0, 0), 0); diff --git a/test/unit/source/canvas_source.test.js b/test/unit/source/canvas_source.test.js index 7b610dfdf75..b11dd1b971e 100644 --- a/test/unit/source/canvas_source.test.js +++ b/test/unit/source/canvas_source.test.js @@ -1,11 +1,11 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const CanvasSource = require('../../../src/source/canvas_source'); -const Transform = require('../../../src/geo/transform'); -const {Event, Evented} = require('../../../src/util/evented'); -const util = require('../../../src/util/util'); -const window = require('../../../src/util/window'); +import { test } from 'mapbox-gl-js-test'; +import CanvasSource from '../../../src/source/canvas_source'; +import Transform from '../../../src/geo/transform'; +import { Event, Evented } from '../../../src/util/evented'; +import util from '../../../src/util/util'; +import window from '../../../src/util/window'; function createSource(options) { window.useFakeHTMLCanvasGetContext(); diff --git a/test/unit/source/geojson_source.test.js b/test/unit/source/geojson_source.test.js index 5bf8861bfef..d95d0953d29 100644 --- a/test/unit/source/geojson_source.test.js +++ b/test/unit/source/geojson_source.test.js @@ -1,12 +1,12 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Tile = require('../../../src/source/tile'); -const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID; -const GeoJSONSource = require('../../../src/source/geojson_source'); -const Transform = require('../../../src/geo/transform'); -const LngLat = require('../../../src/geo/lng_lat'); -const util = require('../../../src/util/util'); +import { test } from 'mapbox-gl-js-test'; +import Tile from '../../../src/source/tile'; +import { OverscaledTileID } from '../../../src/source/tile_id'; +import GeoJSONSource from '../../../src/source/geojson_source'; +import Transform from '../../../src/geo/transform'; +import LngLat from '../../../src/geo/lng_lat'; +import util from '../../../src/util/util'; const mockDispatcher = { send: function () {} diff --git a/test/unit/source/geojson_worker_source.test.js b/test/unit/source/geojson_worker_source.test.js index 13ddace1402..2ad5d9e5613 100644 --- a/test/unit/source/geojson_worker_source.test.js +++ b/test/unit/source/geojson_worker_source.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const GeoJSONWorkerSource = require('../../../src/source/geojson_worker_source'); -const StyleLayerIndex = require('../../../src/style/style_layer_index'); -const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID; -const perf = require('../../../src/util/performance'); +import { test } from 'mapbox-gl-js-test'; +import GeoJSONWorkerSource from '../../../src/source/geojson_worker_source'; +import StyleLayerIndex from '../../../src/style/style_layer_index'; +import { OverscaledTileID } from '../../../src/source/tile_id'; +import perf from '../../../src/util/performance'; test('reloadTile', (t) => { t.test('does not rebuild vector data unless data has changed', (t) => { diff --git a/test/unit/source/geojson_wrapper.test.js b/test/unit/source/geojson_wrapper.test.js index 8a2c17e0ac4..4b9ce4a1880 100644 --- a/test/unit/source/geojson_wrapper.test.js +++ b/test/unit/source/geojson_wrapper.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Wrapper = require('../../../src/source/geojson_wrapper'); +import { test } from 'mapbox-gl-js-test'; +import Wrapper from '../../../src/source/geojson_wrapper'; test('geojsonwrapper', (t) => { diff --git a/test/unit/source/image_source.test.js b/test/unit/source/image_source.test.js index 85ab7e0e701..24a216e05d4 100644 --- a/test/unit/source/image_source.test.js +++ b/test/unit/source/image_source.test.js @@ -1,12 +1,12 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const ImageSource = require('../../../src/source/image_source'); -const {Evented} = require('../../../src/util/evented'); -const Transform = require('../../../src/geo/transform'); -const util = require('../../../src/util/util'); -const ajax = require('../../../src/util/ajax'); -const browser = require('../../../src/util/browser'); +import { test } from 'mapbox-gl-js-test'; +import ImageSource from '../../../src/source/image_source'; +import { Evented } from '../../../src/util/evented'; +import Transform from '../../../src/geo/transform'; +import util from '../../../src/util/util'; +import ajax from '../../../src/util/ajax'; +import browser from '../../../src/util/browser'; function createSource(options) { options = util.extend({ diff --git a/test/unit/source/query_features.test.js b/test/unit/source/query_features.test.js index 4fe87e999f8..31a3440520b 100644 --- a/test/unit/source/query_features.test.js +++ b/test/unit/source/query_features.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const QueryFeatures = require('../../../src/source/query_features.js'); -const SourceCache = require('../../../src/source/source_cache.js'); +import { test } from 'mapbox-gl-js-test'; +import QueryFeatures from '../../../src/source/query_features.js'; +import SourceCache from '../../../src/source/source_cache.js'; test('QueryFeatures#rendered', (t) => { t.test('returns empty object if source returns no tiles', (t) => { diff --git a/test/unit/source/raster_dem_tile_source.test.js b/test/unit/source/raster_dem_tile_source.test.js index 246291dabe9..539f988bc76 100644 --- a/test/unit/source/raster_dem_tile_source.test.js +++ b/test/unit/source/raster_dem_tile_source.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const RasterDEMTileSource = require('../../../src/source/raster_dem_tile_source'); -const window = require('../../../src/util/window'); -const {OverscaledTileID} = require('../../../src/source/tile_id'); +import { test } from 'mapbox-gl-js-test'; +import RasterDEMTileSource from '../../../src/source/raster_dem_tile_source'; +import window from '../../../src/util/window'; +import { OverscaledTileID } from '../../../src/source/tile_id'; function createSource(options, transformCallback) { const source = new RasterDEMTileSource('id', options, { send: function() {} }, options.eventedParent); diff --git a/test/unit/source/raster_dem_tile_worker_source.test.js b/test/unit/source/raster_dem_tile_worker_source.test.js index c9581562f18..7e28f7a3db4 100644 --- a/test/unit/source/raster_dem_tile_worker_source.test.js +++ b/test/unit/source/raster_dem_tile_worker_source.test.js @@ -1,9 +1,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const RasterDEMTileWorkerSource = require('../../../src/source/raster_dem_tile_worker_source'); -const StyleLayerIndex = require('../../../src/style/style_layer_index'); -const {DEMData} = require('../../../src/data/dem_data'); +import { test } from 'mapbox-gl-js-test'; +import RasterDEMTileWorkerSource from '../../../src/source/raster_dem_tile_worker_source'; +import StyleLayerIndex from '../../../src/style/style_layer_index'; +import { DEMData } from '../../../src/data/dem_data'; test('loadTile', (t) => { t.test('loads DEM tile', (t) => { diff --git a/test/unit/source/raster_tile_source.test.js b/test/unit/source/raster_tile_source.test.js index da8604b882a..10303733eec 100644 --- a/test/unit/source/raster_tile_source.test.js +++ b/test/unit/source/raster_tile_source.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const RasterTileSource = require('../../../src/source/raster_tile_source'); -const window = require('../../../src/util/window'); -const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID; +import { test } from 'mapbox-gl-js-test'; +import RasterTileSource from '../../../src/source/raster_tile_source'; +import window from '../../../src/util/window'; +import { OverscaledTileID } from '../../../src/source/tile_id'; function createSource(options, transformCallback) { const source = new RasterTileSource('id', options, { send: function() {} }, options.eventedParent); diff --git a/test/unit/source/source_cache.test.js b/test/unit/source/source_cache.test.js index 0986b0f7773..2e23e646777 100644 --- a/test/unit/source/source_cache.test.js +++ b/test/unit/source/source_cache.test.js @@ -1,16 +1,16 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const SourceCache = require('../../../src/source/source_cache'); -const Source = require('../../../src/source/source'); -const Tile = require('../../../src/source/tile'); -const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID; -const Transform = require('../../../src/geo/transform'); -const LngLat = require('../../../src/geo/lng_lat'); -const Coordinate = require('../../../src/geo/coordinate'); -const {Event, ErrorEvent, Evented} = require('../../../src/util/evented'); -const util = require('../../../src/util/util'); -const browser = require('../../../src/util/browser'); +import { test } from 'mapbox-gl-js-test'; +import SourceCache from '../../../src/source/source_cache'; +import Source from '../../../src/source/source'; +import Tile from '../../../src/source/tile'; +import { OverscaledTileID } from '../../../src/source/tile_id'; +import Transform from '../../../src/geo/transform'; +import LngLat from '../../../src/geo/lng_lat'; +import Coordinate from '../../../src/geo/coordinate'; +import { Event, ErrorEvent, Evented } from '../../../src/util/evented'; +import util from '../../../src/util/util'; +import browser from '../../../src/util/browser'; // Add a mocked source type for use in these tests function MockSourceType(id, sourceOptions, _dispatcher, eventedParent) { diff --git a/test/unit/source/tile.test.js b/test/unit/source/tile.test.js index d9d62069933..5cd2fef4e5b 100644 --- a/test/unit/source/tile.test.js +++ b/test/unit/source/tile.test.js @@ -1,17 +1,17 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Tile = require('../../../src/source/tile'); -const GeoJSONWrapper = require('../../../src/source/geojson_wrapper'); -const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID; -const fs = require('fs'); -const path = require('path'); -const vtpbf = require('vt-pbf'); -const FeatureIndex = require('../../../src/data/feature_index'); -const {CollisionBoxArray} = require('../../../src/data/array_types'); -const util = require('../../../src/util/util'); -const Context = require('../../../src/gl/context'); -const {serialize} = require('../../../src/util/web_worker_transfer'); +import { test } from 'mapbox-gl-js-test'; +import Tile from '../../../src/source/tile'; +import GeoJSONWrapper from '../../../src/source/geojson_wrapper'; +import { OverscaledTileID } from '../../../src/source/tile_id'; +import fs from 'fs'; +import path from 'path'; +import vtpbf from 'vt-pbf'; +import FeatureIndex from '../../../src/data/feature_index'; +import { CollisionBoxArray } from '../../../src/data/array_types'; +import util from '../../../src/util/util'; +import Context from '../../../src/gl/context'; +import { serialize } from '../../../src/util/web_worker_transfer'; test('querySourceFeatures', (t) => { const features = [{ diff --git a/test/unit/source/tile_id.test.js b/test/unit/source/tile_id.test.js index de8e55a756a..427cff4ac4e 100644 --- a/test/unit/source/tile_id.test.js +++ b/test/unit/source/tile_id.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const {CanonicalTileID, OverscaledTileID} = require('../../../src/source/tile_id'); +import { test } from 'mapbox-gl-js-test'; +import { CanonicalTileID, OverscaledTileID } from '../../../src/source/tile_id'; test('CanonicalTileID', (t) => { t.test('#constructor', (t) => { diff --git a/test/unit/source/tile_mask.test.js b/test/unit/source/tile_mask.test.js index f451d83fcf9..3ae6810c4b2 100644 --- a/test/unit/source/tile_mask.test.js +++ b/test/unit/source/tile_mask.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const updateTileMasks = require('../../../src/render/tile_mask'); -const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID; +import { test } from 'mapbox-gl-js-test'; +import updateTileMasks from '../../../src/render/tile_mask'; +import { OverscaledTileID } from '../../../src/source/tile_id'; test('computeTileMasks', (t) => { diff --git a/test/unit/source/vector_tile_source.test.js b/test/unit/source/vector_tile_source.test.js index 661ceaef224..0ca3f763c08 100644 --- a/test/unit/source/vector_tile_source.test.js +++ b/test/unit/source/vector_tile_source.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const VectorTileSource = require('../../../src/source/vector_tile_source'); -const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID; -const window = require('../../../src/util/window'); -const {Evented} = require('../../../src/util/evented'); +import { test } from 'mapbox-gl-js-test'; +import VectorTileSource from '../../../src/source/vector_tile_source'; +import { OverscaledTileID } from '../../../src/source/tile_id'; +import window from '../../../src/util/window'; +import { Evented } from '../../../src/util/evented'; function createSource(options, transformCallback) { const source = new VectorTileSource('id', options, { send: function() {} }, options.eventedParent); diff --git a/test/unit/source/vector_tile_worker_source.test.js b/test/unit/source/vector_tile_worker_source.test.js index 1d218693745..a7ef05fda8f 100644 --- a/test/unit/source/vector_tile_worker_source.test.js +++ b/test/unit/source/vector_tile_worker_source.test.js @@ -1,13 +1,13 @@ 'use strict'; -const fs = require('fs'); -const path = require('path'); -const vt = require('@mapbox/vector-tile'); -const Protobuf = require('pbf'); -const test = require('mapbox-gl-js-test').test; -const VectorTileWorkerSource = require('../../../src/source/vector_tile_worker_source'); -const StyleLayerIndex = require('../../../src/style/style_layer_index'); -const perf = require('../../../src/util/performance'); +import fs from 'fs'; +import path from 'path'; +import vt from '@mapbox/vector-tile'; +import Protobuf from 'pbf'; +import { test } from 'mapbox-gl-js-test'; +import VectorTileWorkerSource from '../../../src/source/vector_tile_worker_source'; +import StyleLayerIndex from '../../../src/style/style_layer_index'; +import perf from '../../../src/util/performance'; test('abortTile', (t) => { t.test('aborts pending request', (t) => { diff --git a/test/unit/source/worker.test.js b/test/unit/source/worker.test.js index 6b7b86a6b0a..262e985e919 100644 --- a/test/unit/source/worker.test.js +++ b/test/unit/source/worker.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Worker = require('../../../src/source/worker'); -const window = require('../../../src/util/window'); +import { test } from 'mapbox-gl-js-test'; +import Worker from '../../../src/source/worker'; +import window from '../../../src/util/window'; const _self = { addEventListener: function() {} diff --git a/test/unit/source/worker_tile.test.js b/test/unit/source/worker_tile.test.js index 6f56780a63b..33c5fa05e13 100644 --- a/test/unit/source/worker_tile.test.js +++ b/test/unit/source/worker_tile.test.js @@ -1,11 +1,11 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const WorkerTile = require('../../../src/source/worker_tile'); -const Wrapper = require('../../../src/source/geojson_wrapper'); -const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID; -const StyleLayerIndex = require('../../../src/style/style_layer_index'); -const util = require('../../../src/util/util'); +import { test } from 'mapbox-gl-js-test'; +import WorkerTile from '../../../src/source/worker_tile'; +import Wrapper from '../../../src/source/geojson_wrapper'; +import { OverscaledTileID } from '../../../src/source/tile_id'; +import StyleLayerIndex from '../../../src/style/style_layer_index'; +import util from '../../../src/util/util'; function createWorkerTile() { return new WorkerTile({ diff --git a/test/unit/style-spec/color.js b/test/unit/style-spec/color.js index a874bee9217..a7c240789b6 100644 --- a/test/unit/style-spec/color.js +++ b/test/unit/style-spec/color.js @@ -2,8 +2,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Color = require('../../../src/style-spec/util/color'); +import { test } from 'mapbox-gl-js-test'; +import Color from '../../../src/style-spec/util/color'; test('Color.parse', (t) => { t.deepEqual(Color.parse('red'), new Color(1, 0, 0, 1)); diff --git a/test/unit/style-spec/composite.test.js b/test/unit/style-spec/composite.test.js index 40d0f8f6c75..d7f20772c92 100644 --- a/test/unit/style-spec/composite.test.js +++ b/test/unit/style-spec/composite.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const composite = require('../../../src/style-spec/composite'); +import { test } from 'mapbox-gl-js-test'; +import composite from '../../../src/style-spec/composite'; test('composites Mapbox vector sources', (t) => { const result = composite({ diff --git a/test/unit/style-spec/convert_function.test.js b/test/unit/style-spec/convert_function.test.js index 07e97864ea0..0def6ffe391 100644 --- a/test/unit/style-spec/convert_function.test.js +++ b/test/unit/style-spec/convert_function.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const convertFunction = require('../../../src/style-spec/function/convert'); +import { test } from 'mapbox-gl-js-test'; +import convertFunction from '../../../src/style-spec/function/convert'; test('convertFunction', (t) => { t.test('feature-constant text-field with token replacement', (t) => { diff --git a/test/unit/style-spec/declass.test.js b/test/unit/style-spec/declass.test.js index 5f9b4a01765..aa2cfb008ed 100644 --- a/test/unit/style-spec/declass.test.js +++ b/test/unit/style-spec/declass.test.js @@ -1,7 +1,7 @@ 'use strict'; -const t = require('mapbox-gl-js-test').test; -const declass = require('../../../src/style-spec/declass'); +import { test as t } from 'mapbox-gl-js-test'; +import declass from '../../../src/style-spec/declass'; t('declass a style, one class', (t) => { const style = { diff --git a/test/unit/style-spec/deref.test.js b/test/unit/style-spec/deref.test.js index 9e2e03083d6..3790a65e92b 100644 --- a/test/unit/style-spec/deref.test.js +++ b/test/unit/style-spec/deref.test.js @@ -1,7 +1,7 @@ 'use strict'; -const t = require('mapbox-gl-js-test').test, - deref = require('../../../src/style-spec/deref'); +import { test as t } from 'mapbox-gl-js-test'; +import deref from '../../../src/style-spec/deref'; t('derefs a ref layer which follows its parent', (t) => { t.deepEqual(deref([ diff --git a/test/unit/style-spec/diff.test.js b/test/unit/style-spec/diff.test.js index 8d5a119b553..ab5ae997e4c 100644 --- a/test/unit/style-spec/diff.test.js +++ b/test/unit/style-spec/diff.test.js @@ -1,7 +1,7 @@ 'use strict'; -const t = require('mapbox-gl-js-test').test, - diffStyles = require('../../../src/style-spec/diff'); +import { test as t } from 'mapbox-gl-js-test'; +import diffStyles from '../../../src/style-spec/diff'; t('diff', (t) => { diff --git a/test/unit/style-spec/expression.test.js b/test/unit/style-spec/expression.test.js index eb5cf6952ae..b80d5daa0e9 100644 --- a/test/unit/style-spec/expression.test.js +++ b/test/unit/style-spec/expression.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const {createPropertyExpression} = require('../../../src/style-spec/expression'); +import { test } from 'mapbox-gl-js-test'; +import { createPropertyExpression } from '../../../src/style-spec/expression'; test('createPropertyExpression', (t) => { test('prohibits piecewise-constant properties from using an "interpolate" expression', (t) => { diff --git a/test/unit/style-spec/feature_filter.test.js b/test/unit/style-spec/feature_filter.test.js index 7938e483802..0050b362ff2 100644 --- a/test/unit/style-spec/feature_filter.test.js +++ b/test/unit/style-spec/feature_filter.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const proxyquire = require('proxyquire'); +import { test } from 'mapbox-gl-js-test'; +import proxyquire from 'proxyquire'; const filterTests = (isEvalSupported) => (t) => { const filter = proxyquire('../../../src/style-spec/feature_filter', { diff --git a/test/unit/style-spec/format.test.js b/test/unit/style-spec/format.test.js index 16e2e1c5bb8..046ad12d1f5 100644 --- a/test/unit/style-spec/format.test.js +++ b/test/unit/style-spec/format.test.js @@ -1,7 +1,7 @@ 'use strict'; -const t = require('mapbox-gl-js-test').test, - format = require('../../../src/style-spec/format'); +import { test as t } from 'mapbox-gl-js-test'; +import format from '../../../src/style-spec/format'; function roundtrip(style) { return JSON.parse(format(style)); diff --git a/test/unit/style-spec/function.test.js b/test/unit/style-spec/function.test.js index 757cb229b68..70258bb1dac 100644 --- a/test/unit/style-spec/function.test.js +++ b/test/unit/style-spec/function.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const {createFunction} = require('../../../src/style-spec/function'); -const Color = require('../../../src/style-spec/util/color'); +import { test } from 'mapbox-gl-js-test'; +import { createFunction } from '../../../src/style-spec/function'; +import Color from '../../../src/style-spec/util/color'; test('binary search', (t) => { t.test('will eventually terminate.', (t) => { diff --git a/test/unit/style-spec/group_by_layout.test.js b/test/unit/style-spec/group_by_layout.test.js index a703336e942..0a8e778856b 100644 --- a/test/unit/style-spec/group_by_layout.test.js +++ b/test/unit/style-spec/group_by_layout.test.js @@ -1,7 +1,7 @@ 'use strict'; -const t = require('mapbox-gl-js-test').test, - group = require('../../../src/style-spec/group_by_layout'); +import { test as t } from 'mapbox-gl-js-test'; +import group from '../../../src/style-spec/group_by_layout'; t('group layers whose ref properties are identical', (t) => { const a = { diff --git a/test/unit/style-spec/interpolate.test.js b/test/unit/style-spec/interpolate.test.js index a56bff53c6c..a64053abaa9 100644 --- a/test/unit/style-spec/interpolate.test.js +++ b/test/unit/style-spec/interpolate.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const interpolate = require('../../../src/style-spec/util/interpolate'); -const Color = require('../../../src/style-spec/util/color'); +import { test } from 'mapbox-gl-js-test'; +import interpolate from '../../../src/style-spec/util/interpolate'; +import Color from '../../../src/style-spec/util/color'; test('interpolate.number', (t) => { t.equal(interpolate.number(0, 1, 0.5), 0.5); diff --git a/test/unit/style-spec/migrate.test.js b/test/unit/style-spec/migrate.test.js index e4c65ed03ea..24fad5dc4b9 100644 --- a/test/unit/style-spec/migrate.test.js +++ b/test/unit/style-spec/migrate.test.js @@ -1,14 +1,14 @@ /* global process, __dirname */ 'use strict'; -const t = require('mapbox-gl-js-test').test, - fs = require('fs'), - glob = require('glob'), - spec = require('../../../src/style-spec/style-spec'), - path = require('path'), - validate = require('../../../src/style-spec/validate_style'), - v8 = require('../../../src/style-spec/reference/v8'), - migrate = require('../../../src/style-spec/migrate'); +import { test as t } from 'mapbox-gl-js-test'; +import fs from 'fs'; +import glob from 'glob'; +import spec from '../../../src/style-spec/style-spec'; +import path from 'path'; +import validate from '../../../src/style-spec/validate_style'; +import v8 from '../../../src/style-spec/reference/v8'; +import migrate from '../../../src/style-spec/migrate'; const UPDATE = !!process.env.UPDATE; diff --git a/test/unit/style-spec/migrate/v8.js b/test/unit/style-spec/migrate/v8.js index fa5bed8e43c..4b4a0ce695b 100644 --- a/test/unit/style-spec/migrate/v8.js +++ b/test/unit/style-spec/migrate/v8.js @@ -1,7 +1,7 @@ 'use strict'; -const t = require('mapbox-gl-js-test').test, - migrate = require('../../../../src/style-spec/migrate/v8'); +import { test as t } from 'mapbox-gl-js-test'; +import migrate from '../../../../src/style-spec/migrate/v8'; t('split text-font', (t) => { const input = { diff --git a/test/unit/style-spec/migrate/v9.js b/test/unit/style-spec/migrate/v9.js index 9c4aba4d625..c270ed48335 100644 --- a/test/unit/style-spec/migrate/v9.js +++ b/test/unit/style-spec/migrate/v9.js @@ -1,7 +1,7 @@ 'use strict'; -const t = require('mapbox-gl-js-test').test, - migrate = require('../../../../src/style-spec/migrate/v9'); +import { test as t } from 'mapbox-gl-js-test'; +import migrate from '../../../../src/style-spec/migrate/v9'; t('deref layers', (t) => { const input = { diff --git a/test/unit/style-spec/spec.test.js b/test/unit/style-spec/spec.test.js index d431f066ffc..4c3bbf84080 100644 --- a/test/unit/style-spec/spec.test.js +++ b/test/unit/style-spec/spec.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const spec = require('../../../src/style-spec/style-spec'); +import { test } from 'mapbox-gl-js-test'; +import spec from '../../../src/style-spec/style-spec'; ['v8', 'latest'].forEach((version) => { ['', 'min'].forEach((kind) => { diff --git a/test/unit/style-spec/util/color_spaces.test.js b/test/unit/style-spec/util/color_spaces.test.js index fc82148faaf..38fc2796a58 100644 --- a/test/unit/style-spec/util/color_spaces.test.js +++ b/test/unit/style-spec/util/color_spaces.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const colorSpaces = require('../../../../src/style-spec/util/color_spaces'); -const Color = require('../../../../src/style-spec/util/color'); +import { test } from 'mapbox-gl-js-test'; +import colorSpaces from '../../../../src/style-spec/util/color_spaces'; +import Color from '../../../../src/style-spec/util/color'; test('#hclToRgb zero', (t) => { const hclColor = {h: 0, c: 0, l: 0, alpha: null}; diff --git a/test/unit/style-spec/validate.test.js b/test/unit/style-spec/validate.test.js index aa39ba98baf..6557a1633a2 100644 --- a/test/unit/style-spec/validate.test.js +++ b/test/unit/style-spec/validate.test.js @@ -1,11 +1,11 @@ /* global process, __dirname */ 'use strict'; -const t = require('mapbox-gl-js-test').test, - glob = require('glob'), - fs = require('fs'), - path = require('path'), - validate = require('../../../src/style-spec/validate_style'); +import { test as t } from 'mapbox-gl-js-test'; +import glob from 'glob'; +import fs from 'fs'; +import path from 'path'; +import validate from '../../../src/style-spec/validate_style'; const UPDATE = !!process.env.UPDATE; @@ -23,7 +23,7 @@ glob.sync(`${__dirname}/fixture/*.input.json`).forEach((file) => { const fixtures = glob.sync(`${__dirname}/fixture/*.input.json`); const style = JSON.parse(fs.readFileSync(fixtures[0])); -const reference = require('../../../src/style-spec/reference/latest'); +import reference from '../../../src/style-spec/reference/latest'; t('validate.parsed exists', (t) => { t.equal(typeof validate.parsed, 'function'); diff --git a/test/unit/style/light.test.js b/test/unit/style/light.test.js index 3015ecc4ca8..80abb611c2a 100644 --- a/test/unit/style/light.test.js +++ b/test/unit/style/light.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Light = require('../../../src/style/light'); -const spec = require('../../../src/style-spec/reference/latest').light; -const Color = require('../../../src/style-spec/util/color'); -const {sphericalToCartesian} = require('../../../src/util/util'); +import { test } from 'mapbox-gl-js-test'; +import Light from '../../../src/style/light'; +import { light as spec } from '../../../src/style-spec/reference/latest'; +import Color from '../../../src/style-spec/util/color'; +import { sphericalToCartesian } from '../../../src/util/util'; test('Light with defaults', (t) => { const light = new Light({}); diff --git a/test/unit/style/load_glyph_range.test.js b/test/unit/style/load_glyph_range.test.js index d24d5081cf1..861b2c355da 100644 --- a/test/unit/style/load_glyph_range.test.js +++ b/test/unit/style/load_glyph_range.test.js @@ -2,8 +2,8 @@ 'use strict'; -const {test} = require('mapbox-gl-js-test'); -const proxyquire = require('proxyquire'); +import { test } from 'mapbox-gl-js-test'; +import proxyquire from 'proxyquire'; test('loadGlyphRange', (t) => { const transform = t.stub().callsFake((url) => ({url})); diff --git a/test/unit/style/style.test.js b/test/unit/style/style.test.js index 927f02e09e8..21ea99b5766 100644 --- a/test/unit/style/style.test.js +++ b/test/unit/style/style.test.js @@ -1,17 +1,17 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const proxyquire = require('proxyquire'); -const Style = require('../../../src/style/style'); -const SourceCache = require('../../../src/source/source_cache'); -const StyleLayer = require('../../../src/style/style_layer'); -const Transform = require('../../../src/geo/transform'); -const util = require('../../../src/util/util'); -const {Event, Evented} = require('../../../src/util/evented'); -const window = require('../../../src/util/window'); -const rtlTextPlugin = require('../../../src/source/rtl_text_plugin'); -const ajax = require('../../../src/util/ajax'); -const browser = require('../../../src/util/browser'); +import { test } from 'mapbox-gl-js-test'; +import proxyquire from 'proxyquire'; +import Style from '../../../src/style/style'; +import SourceCache from '../../../src/source/source_cache'; +import StyleLayer from '../../../src/style/style_layer'; +import Transform from '../../../src/geo/transform'; +import util from '../../../src/util/util'; +import { Event, Evented } from '../../../src/util/evented'; +import window from '../../../src/util/window'; +import rtlTextPlugin from '../../../src/source/rtl_text_plugin'; +import ajax from '../../../src/util/ajax'; +import browser from '../../../src/util/browser'; function createStyleJSON(properties) { return util.extend({ diff --git a/test/unit/style/style_layer.test.js b/test/unit/style/style_layer.test.js index d2397cd2b2a..022b6724507 100644 --- a/test/unit/style/style_layer.test.js +++ b/test/unit/style/style_layer.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const StyleLayer = require('../../../src/style/style_layer'); -const FillStyleLayer = require('../../../src/style/style_layer/fill_style_layer'); -const util = require('../../../src/util/util'); -const Color = require('../../../src/style-spec/util/color'); +import { test } from 'mapbox-gl-js-test'; +import StyleLayer from '../../../src/style/style_layer'; +import FillStyleLayer from '../../../src/style/style_layer/fill_style_layer'; +import util from '../../../src/util/util'; +import Color from '../../../src/style-spec/util/color'; test('StyleLayer', (t) => { t.test('instantiates the correct subclass', (t) => { diff --git a/test/unit/style/style_layer_index.test.js b/test/unit/style/style_layer_index.test.js index a4e5e029ccd..4cfafaa6a6f 100644 --- a/test/unit/style/style_layer_index.test.js +++ b/test/unit/style/style_layer_index.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const util = require('../../../src/util/util'); -const StyleLayerIndex = require('../../../src/style/style_layer_index'); +import { test } from 'mapbox-gl-js-test'; +import util from '../../../src/util/util'; +import StyleLayerIndex from '../../../src/style/style_layer_index'; test('StyleLayerIndex#replace', (t) => { const index = new StyleLayerIndex([ diff --git a/test/unit/symbol/anchor.test.js b/test/unit/symbol/anchor.test.js index b30cd08782b..4b77c81e755 100644 --- a/test/unit/symbol/anchor.test.js +++ b/test/unit/symbol/anchor.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Anchor = require('../../../src/symbol/anchor'); +import { test } from 'mapbox-gl-js-test'; +import Anchor from '../../../src/symbol/anchor'; test('Anchor', (t) => { t.test('#constructor', (t) => { diff --git a/test/unit/symbol/check_max_angle.test.js b/test/unit/symbol/check_max_angle.test.js index 04fab251722..2c1fe0a3544 100644 --- a/test/unit/symbol/check_max_angle.test.js +++ b/test/unit/symbol/check_max_angle.test.js @@ -1,9 +1,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Point = require('@mapbox/point-geometry'); -const checkMaxAngle = require('../../../src/symbol/check_max_angle'); -const Anchor = require('../../../src/symbol/anchor'); +import { test } from 'mapbox-gl-js-test'; +import Point from '@mapbox/point-geometry'; +import checkMaxAngle from '../../../src/symbol/check_max_angle'; +import Anchor from '../../../src/symbol/anchor'; test('line with no sharp angles', (t) => { const line = [ new Point(0, 0), new Point(20, -1), new Point(40, 1), new Point(60, 0) ]; diff --git a/test/unit/symbol/collision_feature.js b/test/unit/symbol/collision_feature.js index 9f5a274ce82..69e92c37192 100644 --- a/test/unit/symbol/collision_feature.js +++ b/test/unit/symbol/collision_feature.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const CollisionFeature = require('../../../src/symbol/collision_feature'); -const Anchor = require('../../../src/symbol/anchor'); -const Point = require('@mapbox/point-geometry'); -const {CollisionBoxArray} = require('../../../src/data/array_types'); +import { test } from 'mapbox-gl-js-test'; +import CollisionFeature from '../../../src/symbol/collision_feature'; +import Anchor from '../../../src/symbol/anchor'; +import Point from '@mapbox/point-geometry'; +import { CollisionBoxArray } from '../../../src/data/array_types'; test('CollisionFeature', (t) => { diff --git a/test/unit/symbol/cross_tile_symbol_index.js b/test/unit/symbol/cross_tile_symbol_index.js index 3dbf4062c98..6324fa88ce7 100644 --- a/test/unit/symbol/cross_tile_symbol_index.js +++ b/test/unit/symbol/cross_tile_symbol_index.js @@ -1,9 +1,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Anchor = require('../../../src/symbol/anchor'); -const CrossTileSymbolIndex = require('../../../src/symbol/cross_tile_symbol_index'); -const {OverscaledTileID} = require('../../../src/source/tile_id'); +import { test } from 'mapbox-gl-js-test'; +import Anchor from '../../../src/symbol/anchor'; +import CrossTileSymbolIndex from '../../../src/symbol/cross_tile_symbol_index'; +import { OverscaledTileID } from '../../../src/source/tile_id'; const styleLayer = { id: 'test' diff --git a/test/unit/symbol/get_anchors.test.js b/test/unit/symbol/get_anchors.test.js index ac7a4ec1670..1ee0cfc7a14 100644 --- a/test/unit/symbol/get_anchors.test.js +++ b/test/unit/symbol/get_anchors.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Point = require('@mapbox/point-geometry'); -const getAnchors = require('../../../src/symbol/get_anchors'); +import { test } from 'mapbox-gl-js-test'; +import Point from '@mapbox/point-geometry'; +import getAnchors from '../../../src/symbol/get_anchors'; const TILE_EXTENT = 4096; diff --git a/test/unit/symbol/grid_index.test.js b/test/unit/symbol/grid_index.test.js index 6e7cb002b9f..7de76d05f3f 100644 --- a/test/unit/symbol/grid_index.test.js +++ b/test/unit/symbol/grid_index.test.js @@ -1,8 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; - -const GridIndex = require('../../../src/symbol/grid_index'); +import { test } from 'mapbox-gl-js-test'; +import GridIndex from '../../../src/symbol/grid_index'; test('GridIndex', (t) => { diff --git a/test/unit/symbol/mergelines.test.js b/test/unit/symbol/mergelines.test.js index a7f37cb267a..1904615c68b 100644 --- a/test/unit/symbol/mergelines.test.js +++ b/test/unit/symbol/mergelines.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const mergeLines = require('../../../src/symbol/mergelines'); -const Point = require('@mapbox/point-geometry'); +import { test } from 'mapbox-gl-js-test'; +import mergeLines from '../../../src/symbol/mergelines'; +import Point from '@mapbox/point-geometry'; function makeFeatures(lines) { const features = []; diff --git a/test/unit/symbol/quads.test.js b/test/unit/symbol/quads.test.js index 403b8987339..f11e11140b1 100644 --- a/test/unit/symbol/quads.test.js +++ b/test/unit/symbol/quads.test.js @@ -1,10 +1,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; - -const getIconQuads = require('../../../src/symbol/quads').getIconQuads; -const Anchor = require('../../../src/symbol/anchor'); -const SymbolStyleLayer = require('../../../src/style/style_layer/symbol_style_layer'); +import { test } from 'mapbox-gl-js-test'; +import { getIconQuads } from '../../../src/symbol/quads'; +import Anchor from '../../../src/symbol/anchor'; +import SymbolStyleLayer from '../../../src/style/style_layer/symbol_style_layer'; function createLayer(layer) { const result = new SymbolStyleLayer(layer); diff --git a/test/unit/symbol/shaping.test.js b/test/unit/symbol/shaping.test.js index ff9731b3c4b..3f2d3e89833 100644 --- a/test/unit/symbol/shaping.test.js +++ b/test/unit/symbol/shaping.test.js @@ -1,9 +1,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const fs = require('fs'); -const path = require('path'); -const shaping = require('../../../src/symbol/shaping'); +import { test } from 'mapbox-gl-js-test'; +import fs from 'fs'; +import path from 'path'; +import shaping from '../../../src/symbol/shaping'; const WritingMode = shaping.WritingMode; let UPDATE = false; diff --git a/test/unit/ui/camera.test.js b/test/unit/ui/camera.test.js index cfb4d7bae3c..9f758c475fc 100644 --- a/test/unit/ui/camera.test.js +++ b/test/unit/ui/camera.test.js @@ -1,11 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Camera = require('../../../src/ui/camera'); -const Transform = require('../../../src/geo/transform'); -const browser = require('../../../src/util/browser'); - -const fixed = require('mapbox-gl-js-test/fixed'); +import { test } from 'mapbox-gl-js-test'; +import Camera from '../../../src/ui/camera'; +import Transform from '../../../src/geo/transform'; +import browser from '../../../src/util/browser'; +import fixed from 'mapbox-gl-js-test/fixed'; const fixedLngLat = fixed.LngLat; const fixedNum = fixed.Num; diff --git a/test/unit/ui/control/attribution.test.js b/test/unit/ui/control/attribution.test.js index 0f8a311321b..5c62b7e7cc2 100644 --- a/test/unit/ui/control/attribution.test.js +++ b/test/unit/ui/control/attribution.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const config = require('../../../../src/util/config'); -const AttributionControl = require('../../../../src/ui/control/attribution_control'); +import { test } from 'mapbox-gl-js-test'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import config from '../../../../src/util/config'; +import AttributionControl from '../../../../src/ui/control/attribution_control'; function createMap() { const container = window.document.createElement('div'); diff --git a/test/unit/ui/control/fullscreen.test.js b/test/unit/ui/control/fullscreen.test.js index 4f3a8744543..9a464b4dfcd 100644 --- a/test/unit/ui/control/fullscreen.test.js +++ b/test/unit/ui/control/fullscreen.test.js @@ -1,9 +1,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const FullscreenControl = require('../../../../src/ui/control/fullscreen_control'); +import { test } from 'mapbox-gl-js-test'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import FullscreenControl from '../../../../src/ui/control/fullscreen_control'; function createMap() { const container = window.document.createElement('div'); diff --git a/test/unit/ui/control/geolocate.test.js b/test/unit/ui/control/geolocate.test.js index ecf6ce40eb7..f4cc2d836e3 100644 --- a/test/unit/ui/control/geolocate.test.js +++ b/test/unit/ui/control/geolocate.test.js @@ -1,14 +1,14 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const GeolocateControl = require('../../../../src/ui/control/geolocate_control'); +import { test } from 'mapbox-gl-js-test'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import GeolocateControl from '../../../../src/ui/control/geolocate_control'; // window and navigator globals need to be set for mock-geolocation global.window = {}; global.navigator = {}; -const geolocation = require('mock-geolocation'); +import geolocation from 'mock-geolocation'; geolocation.use(); // assign the mock geolocation to window diff --git a/test/unit/ui/control/logo.test.js b/test/unit/ui/control/logo.test.js index d70a79017af..44c3fef75c7 100644 --- a/test/unit/ui/control/logo.test.js +++ b/test/unit/ui/control/logo.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const VectorTileSource = require('../../../../src/source/vector_tile_source'); -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); +import { test } from 'mapbox-gl-js-test'; +import VectorTileSource from '../../../../src/source/vector_tile_source'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; function createMap(logoPosition, logoRequired) { const container = window.document.createElement('div'); diff --git a/test/unit/ui/handler/box_zoom.test.js b/test/unit/ui/handler/box_zoom.test.js index e9d241843f0..401ca1ffaf4 100644 --- a/test/unit/ui/handler/box_zoom.test.js +++ b/test/unit/ui/handler/box_zoom.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const DOM = require('../../../../src/util/dom'); -const simulate = require('mapbox-gl-js-test/simulate_interaction'); +import { test } from 'mapbox-gl-js-test'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import DOM from '../../../../src/util/dom'; +import simulate from 'mapbox-gl-js-test/simulate_interaction'; function createMap() { return new Map({ container: DOM.create('div', '', window.document.body) }); diff --git a/test/unit/ui/handler/dblclick_zoom.test.js b/test/unit/ui/handler/dblclick_zoom.test.js index 999bbe1d132..39ce57c6892 100644 --- a/test/unit/ui/handler/dblclick_zoom.test.js +++ b/test/unit/ui/handler/dblclick_zoom.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const DOM = require('../../../../src/util/dom'); -const simulate = require('mapbox-gl-js-test/simulate_interaction'); +import { test } from 'mapbox-gl-js-test'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import DOM from '../../../../src/util/dom'; +import simulate from 'mapbox-gl-js-test/simulate_interaction'; function createMap() { return new Map({ container: DOM.create('div', '', window.document.body) }); diff --git a/test/unit/ui/handler/drag_pan.test.js b/test/unit/ui/handler/drag_pan.test.js index 0ba2b4c3332..9727faee909 100644 --- a/test/unit/ui/handler/drag_pan.test.js +++ b/test/unit/ui/handler/drag_pan.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const DOM = require('../../../../src/util/dom'); -const simulate = require('mapbox-gl-js-test/simulate_interaction'); +import { test } from 'mapbox-gl-js-test'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import DOM from '../../../../src/util/dom'; +import simulate from 'mapbox-gl-js-test/simulate_interaction'; function createMap() { return new Map({ container: DOM.create('div', '', window.document.body) }); diff --git a/test/unit/ui/handler/drag_rotate.test.js b/test/unit/ui/handler/drag_rotate.test.js index 3d08f52e0a0..440bed4c597 100644 --- a/test/unit/ui/handler/drag_rotate.test.js +++ b/test/unit/ui/handler/drag_rotate.test.js @@ -1,11 +1,11 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const util = require('../../../../src/util/util'); -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const DOM = require('../../../../src/util/dom'); -const simulate = require('mapbox-gl-js-test/simulate_interaction'); +import { test } from 'mapbox-gl-js-test'; +import util from '../../../../src/util/util'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import DOM from '../../../../src/util/dom'; +import simulate from 'mapbox-gl-js-test/simulate_interaction'; function createMap(options) { return new Map(util.extend({ container: DOM.create('div', '', window.document.body) }, options)); diff --git a/test/unit/ui/handler/scroll_zoom.test.js b/test/unit/ui/handler/scroll_zoom.test.js index 45029189ff2..bf30c7a817c 100644 --- a/test/unit/ui/handler/scroll_zoom.test.js +++ b/test/unit/ui/handler/scroll_zoom.test.js @@ -1,12 +1,12 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const browser = require('../../../../src/util/browser'); -const util = require('../../../../src/util/util'); -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const DOM = require('../../../../src/util/dom'); -const simulate = require('mapbox-gl-js-test/simulate_interaction'); +import { test } from 'mapbox-gl-js-test'; +import browser from '../../../../src/util/browser'; +import util from '../../../../src/util/util'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import DOM from '../../../../src/util/dom'; +import simulate from 'mapbox-gl-js-test/simulate_interaction'; function createMap(options) { return new Map(util.extend({ diff --git a/test/unit/ui/handler/touch_zoom_rotate.test.js b/test/unit/ui/handler/touch_zoom_rotate.test.js index 50b137e1699..70f57960a70 100644 --- a/test/unit/ui/handler/touch_zoom_rotate.test.js +++ b/test/unit/ui/handler/touch_zoom_rotate.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const DOM = require('../../../../src/util/dom'); -const simulate = require('mapbox-gl-js-test/simulate_interaction'); +import { test } from 'mapbox-gl-js-test'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import DOM from '../../../../src/util/dom'; +import simulate from 'mapbox-gl-js-test/simulate_interaction'; function createMap() { return new Map({ container: DOM.create('div', '', window.document.body) }); diff --git a/test/unit/ui/hash.test.js b/test/unit/ui/hash.test.js index 67f7fa7b99d..b4b4ddc2909 100644 --- a/test/unit/ui/hash.test.js +++ b/test/unit/ui/hash.test.js @@ -1,9 +1,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Hash = require('../../../src/ui/hash'); -const window = require('../../../src/util/window'); -const Map = require('../../../src/ui/map'); +import { test } from 'mapbox-gl-js-test'; +import Hash from '../../../src/ui/hash'; +import window from '../../../src/util/window'; +import Map from '../../../src/ui/map'; test('hash', (t) => { function createHash() { diff --git a/test/unit/ui/map.test.js b/test/unit/ui/map.test.js index 9f83caf3be5..b44c6291dbb 100755 --- a/test/unit/ui/map.test.js +++ b/test/unit/ui/map.test.js @@ -1,15 +1,14 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const util = require('../../../src/util/util'); -const window = require('../../../src/util/window'); -const Map = require('../../../src/ui/map'); -const LngLat = require('../../../src/geo/lng_lat'); -const Tile = require('../../../src/source/tile'); -const OverscaledTileID = require('../../../src/source/tile_id').OverscaledTileID; -const {Event, ErrorEvent} = require('../../../src/util/evented'); - -const fixed = require('mapbox-gl-js-test/fixed'); +import { test } from 'mapbox-gl-js-test'; +import util from '../../../src/util/util'; +import window from '../../../src/util/window'; +import Map from '../../../src/ui/map'; +import LngLat from '../../../src/geo/lng_lat'; +import Tile from '../../../src/source/tile'; +import { OverscaledTileID } from '../../../src/source/tile_id'; +import { Event, ErrorEvent } from '../../../src/util/evented'; +import fixed from 'mapbox-gl-js-test/fixed'; const fixedNum = fixed.Num; const fixedLngLat = fixed.LngLat; const fixedCoord = fixed.Coord; diff --git a/test/unit/ui/map/isMoving.test.js b/test/unit/ui/map/isMoving.test.js index 1e7deea4159..00fd4c23911 100644 --- a/test/unit/ui/map/isMoving.test.js +++ b/test/unit/ui/map/isMoving.test.js @@ -1,11 +1,11 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const browser = require('../../../../src/util/browser'); -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const DOM = require('../../../../src/util/dom'); -const simulate = require('mapbox-gl-js-test/simulate_interaction'); +import { test } from 'mapbox-gl-js-test'; +import browser from '../../../../src/util/browser'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import DOM from '../../../../src/util/dom'; +import simulate from 'mapbox-gl-js-test/simulate_interaction'; function createMap() { return new Map({ container: DOM.create('div', '', window.document.body) }); diff --git a/test/unit/ui/map/isRotating.test.js b/test/unit/ui/map/isRotating.test.js index 3c84d8e850c..dd4cea0b6f2 100644 --- a/test/unit/ui/map/isRotating.test.js +++ b/test/unit/ui/map/isRotating.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const DOM = require('../../../../src/util/dom'); -const simulate = require('mapbox-gl-js-test/simulate_interaction'); +import { test } from 'mapbox-gl-js-test'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import DOM from '../../../../src/util/dom'; +import simulate from 'mapbox-gl-js-test/simulate_interaction'; function createMap() { return new Map({ container: DOM.create('div', '', window.document.body) }); diff --git a/test/unit/ui/map/isZooming.test.js b/test/unit/ui/map/isZooming.test.js index f42683523ee..99ae2900c90 100644 --- a/test/unit/ui/map/isZooming.test.js +++ b/test/unit/ui/map/isZooming.test.js @@ -1,11 +1,11 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const browser = require('../../../../src/util/browser'); -const window = require('../../../../src/util/window'); -const Map = require('../../../../src/ui/map'); -const DOM = require('../../../../src/util/dom'); -const simulate = require('mapbox-gl-js-test/simulate_interaction'); +import { test } from 'mapbox-gl-js-test'; +import browser from '../../../../src/util/browser'; +import window from '../../../../src/util/window'; +import Map from '../../../../src/ui/map'; +import DOM from '../../../../src/util/dom'; +import simulate from 'mapbox-gl-js-test/simulate_interaction'; function createMap() { return new Map({ container: DOM.create('div', '', window.document.body) }); diff --git a/test/unit/ui/map_events.test.js b/test/unit/ui/map_events.test.js index e6b8f70354f..d64b1facca2 100644 --- a/test/unit/ui/map_events.test.js +++ b/test/unit/ui/map_events.test.js @@ -1,9 +1,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Map = require('../../../src/ui/map'); -const window = require('../../../src/util/window'); -const simulate = require('mapbox-gl-js-test/simulate_interaction'); +import { test } from 'mapbox-gl-js-test'; +import Map from '../../../src/ui/map'; +import window from '../../../src/util/window'; +import simulate from 'mapbox-gl-js-test/simulate_interaction'; function createMap() { return new Map({ diff --git a/test/unit/ui/marker.test.js b/test/unit/ui/marker.test.js index d8b553c2d78..ef08fc40b50 100644 --- a/test/unit/ui/marker.test.js +++ b/test/unit/ui/marker.test.js @@ -1,12 +1,12 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const window = require('../../../src/util/window'); -const Map = require('../../../src/ui/map'); -const Marker = require('../../../src/ui/marker'); -const Popup = require('../../../src/ui/popup'); -const LngLat = require('../../../src/geo/lng_lat'); -const Point = require('@mapbox/point-geometry'); +import { test } from 'mapbox-gl-js-test'; +import window from '../../../src/util/window'; +import Map from '../../../src/ui/map'; +import Marker from '../../../src/ui/marker'; +import Popup from '../../../src/ui/popup'; +import LngLat from '../../../src/geo/lng_lat'; +import Point from '@mapbox/point-geometry'; function createMap() { const container = window.document.createElement('div'); diff --git a/test/unit/ui/popup.test.js b/test/unit/ui/popup.test.js index e25508da5b0..5749a6178a0 100644 --- a/test/unit/ui/popup.test.js +++ b/test/unit/ui/popup.test.js @@ -1,12 +1,12 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const window = require('../../../src/util/window'); -const Map = require('../../../src/ui/map'); -const Popup = require('../../../src/ui/popup'); -const LngLat = require('../../../src/geo/lng_lat'); -const Point = require('@mapbox/point-geometry'); -const simulateClick = require('mapbox-gl-js-test/simulate_interaction').click; +import { test } from 'mapbox-gl-js-test'; +import window from '../../../src/util/window'; +import Map from '../../../src/ui/map'; +import Popup from '../../../src/ui/popup'; +import LngLat from '../../../src/geo/lng_lat'; +import Point from '@mapbox/point-geometry'; +import { click as simulateClick } from 'mapbox-gl-js-test/simulate_interaction'; const containerWidth = 512; const containerHeight = 512; diff --git a/test/unit/util/actor.test.js b/test/unit/util/actor.test.js index 0d42a242993..8bf5f54a375 100644 --- a/test/unit/util/actor.test.js +++ b/test/unit/util/actor.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const proxyquire = require('proxyquire'); -const Actor = require('../../../src/util/actor'); +import { test } from 'mapbox-gl-js-test'; +import proxyquire from 'proxyquire'; +import Actor from '../../../src/util/actor'; test('Actor', (t) => { t.test('forwards resopnses to correct callback', (t) => { diff --git a/test/unit/util/ajax.test.js b/test/unit/util/ajax.test.js index 1a322a329fa..dafada3af1b 100644 --- a/test/unit/util/ajax.test.js +++ b/test/unit/util/ajax.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const ajax = require('../../../src/util/ajax'); -const window = require('../../../src/util/window'); +import { test } from 'mapbox-gl-js-test'; +import ajax from '../../../src/util/ajax'; +import window from '../../../src/util/window'; test('ajax', (t) => { t.beforeEach(callback => { diff --git a/test/unit/util/browser.test.js b/test/unit/util/browser.test.js index af63b6fae80..c4430fd39da 100644 --- a/test/unit/util/browser.test.js +++ b/test/unit/util/browser.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const browser = require('../../../src/util/browser'); +import { test } from 'mapbox-gl-js-test'; +import browser from '../../../src/util/browser'; test('browser', (t) => { t.test('frame', (t) => { diff --git a/test/unit/util/classify_rings.test.js b/test/unit/util/classify_rings.test.js index d2171f0647e..f670d3dc226 100644 --- a/test/unit/util/classify_rings.test.js +++ b/test/unit/util/classify_rings.test.js @@ -1,11 +1,11 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const fs = require('fs'); -const path = require('path'); -const Protobuf = require('pbf'); -const VectorTile = require('@mapbox/vector-tile').VectorTile; -const classifyRings = require('../../../src/util/classify_rings'); +import { test } from 'mapbox-gl-js-test'; +import fs from 'fs'; +import path from 'path'; +import Protobuf from 'pbf'; +import { VectorTile } from '@mapbox/vector-tile'; +import classifyRings from '../../../src/util/classify_rings'; // Load a fill feature from fixture tile. const vt = new VectorTile(new Protobuf(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf')))); diff --git a/test/unit/util/dispatcher.test.js b/test/unit/util/dispatcher.test.js index 77f73832fec..09c2da76f6d 100644 --- a/test/unit/util/dispatcher.test.js +++ b/test/unit/util/dispatcher.test.js @@ -1,9 +1,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const proxyquire = require('proxyquire'); -const Dispatcher = require('../../../src/util/dispatcher'); -const WebWorker = require('../../../src/util/web_worker'); +import { test } from 'mapbox-gl-js-test'; +import proxyquire from 'proxyquire'; +import Dispatcher from '../../../src/util/dispatcher'; +import WebWorker from '../../../src/util/web_worker'; test('Dispatcher', (t) => { t.test('requests and releases workers from pool', (t) => { diff --git a/test/unit/util/evented.test.js b/test/unit/util/evented.test.js index 7635090d509..8a15ebdab64 100644 --- a/test/unit/util/evented.test.js +++ b/test/unit/util/evented.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const {Event, Evented} = require('../../../src/util/evented'); +import { test } from 'mapbox-gl-js-test'; +import { Event, Evented } from '../../../src/util/evented'; test('Evented', (t) => { diff --git a/test/unit/util/find_pole_of_inaccessibility.test.js b/test/unit/util/find_pole_of_inaccessibility.test.js index f52f90f9d09..81f189348e8 100644 --- a/test/unit/util/find_pole_of_inaccessibility.test.js +++ b/test/unit/util/find_pole_of_inaccessibility.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const Point = require('@mapbox/point-geometry'); -const findPoleOfInaccessibility = require('../../../src/util/find_pole_of_inaccessibility'); +import { test } from 'mapbox-gl-js-test'; +import Point from '@mapbox/point-geometry'; +import findPoleOfInaccessibility from '../../../src/util/find_pole_of_inaccessibility'; test('polygon_poi', (t) => { diff --git a/test/unit/util/lru_cache.test.js b/test/unit/util/lru_cache.test.js index 4842c0c4b40..d7c309f5eee 100644 --- a/test/unit/util/lru_cache.test.js +++ b/test/unit/util/lru_cache.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const LRUCache = require('../../../src/util/lru_cache'); +import { test } from 'mapbox-gl-js-test'; +import LRUCache from '../../../src/util/lru_cache'; test('LRUCache', (t) => { const cache = new LRUCache(10, (removed) => { diff --git a/test/unit/util/mapbox.test.js b/test/unit/util/mapbox.test.js index da8c5b4798c..1da3508002e 100644 --- a/test/unit/util/mapbox.test.js +++ b/test/unit/util/mapbox.test.js @@ -1,10 +1,10 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const mapbox = require('../../../src/util/mapbox'); -const config = require('../../../src/util/config'); -const browser = require('../../../src/util/browser'); -const window = require('../../../src/util/window'); +import { test } from 'mapbox-gl-js-test'; +import mapbox from '../../../src/util/mapbox'; +import config from '../../../src/util/config'; +import browser from '../../../src/util/browser'; +import window from '../../../src/util/window'; test("mapbox", (t) => { const mapboxSource = 'mapbox://user.map'; diff --git a/test/unit/util/struct_array.test.js b/test/unit/util/struct_array.test.js index 0550bea40c4..7511b85f724 100644 --- a/test/unit/util/struct_array.test.js +++ b/test/unit/util/struct_array.test.js @@ -1,8 +1,8 @@ // @flow 'use strict'; -const test = require('mapbox-gl-js-test').test; -const {StructArrayLayout3i6, FeatureIndexArray} = require('../../../src/data/array_types'); +import { test } from 'mapbox-gl-js-test'; +import { StructArrayLayout3i6, FeatureIndexArray } from '../../../src/data/array_types'; test('StructArray', (t) => { class TestArray extends StructArrayLayout3i6 {} diff --git a/test/unit/util/throttle.test.js b/test/unit/util/throttle.test.js index 962d89ba9da..83c81ee7a1f 100644 --- a/test/unit/util/throttle.test.js +++ b/test/unit/util/throttle.test.js @@ -1,8 +1,10 @@ 'use strict'; + // @flow -const test = require('mapbox-gl-js-test').test; -const throttle = require('../../../src/util/throttle'); +import { test } from 'mapbox-gl-js-test'; + +import throttle from '../../../src/util/throttle'; test('throttle', (t) => { diff --git a/test/unit/util/tile_cover.test.js b/test/unit/util/tile_cover.test.js index 96a1d3b01cc..5f587165952 100644 --- a/test/unit/util/tile_cover.test.js +++ b/test/unit/util/tile_cover.test.js @@ -1,8 +1,8 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const tileCover = require('../../../src/util/tile_cover'); -const {OverscaledTileID} = require('../../../src/source/tile_id'); +import { test } from 'mapbox-gl-js-test'; +import tileCover from '../../../src/util/tile_cover'; +import { OverscaledTileID } from '../../../src/source/tile_id'; test('tileCover', (t) => { diff --git a/test/unit/util/token.test.js b/test/unit/util/token.test.js index 526eeeafd89..5cf508b4c92 100644 --- a/test/unit/util/token.test.js +++ b/test/unit/util/token.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const resolveTokens = require('../../../src/util/token'); +import { test } from 'mapbox-gl-js-test'; +import resolveTokens from '../../../src/util/token'; test('resolveToken', (t) => { t.equal('3 Fine Fields', resolveTokens({a:3, b:'Fine', c:'Fields'}, '{a} {b} {c}')); diff --git a/test/unit/util/util.test.js b/test/unit/util/util.test.js index 4c9e5e4f022..6a0d822ea68 100644 --- a/test/unit/util/util.test.js +++ b/test/unit/util/util.test.js @@ -1,10 +1,12 @@ 'use strict'; + // @flow -const test = require('mapbox-gl-js-test').test; -const Coordinate = require('../../../src/geo/coordinate'); -const util = require('../../../src/util/util'); -const Point = require('@mapbox/point-geometry'); +import { test } from 'mapbox-gl-js-test'; + +import Coordinate from '../../../src/geo/coordinate'; +import util from '../../../src/util/util'; +import Point from '@mapbox/point-geometry'; test('util', (t) => { t.equal(util.easeCubicInOut(0), 0, 'easeCubicInOut=0'); diff --git a/test/unit/util/web_worker_transfer.test.js b/test/unit/util/web_worker_transfer.test.js index fa9a9382a3d..7a5d7538e5d 100644 --- a/test/unit/util/web_worker_transfer.test.js +++ b/test/unit/util/web_worker_transfer.test.js @@ -2,12 +2,9 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const {register, serialize, deserialize} = require('../../../src/util/web_worker_transfer'); - -/*:: +import { test } from 'mapbox-gl-js-test'; +import { register, serialize, deserialize } from '../../../src/util/web_worker_transfer'; import type {Serialized} from '../../../src/util/web_worker_transfer'; -*/ test('round trip', (t) => { class Foo { diff --git a/test/unit/util/worker_pool.test.js b/test/unit/util/worker_pool.test.js index e1dcd5ffa21..0c3ff9859ba 100644 --- a/test/unit/util/worker_pool.test.js +++ b/test/unit/util/worker_pool.test.js @@ -1,7 +1,7 @@ 'use strict'; -const test = require('mapbox-gl-js-test').test; -const proxyquire = require('proxyquire'); +import { test } from 'mapbox-gl-js-test'; +import proxyquire from 'proxyquire'; test('WorkerPool', (t) => { t.test('#acquire', (t) => {