[codemod] Convert test/unit to use import instead of require

5to6 cjs transform
mapbox · Feb 27, 2018 · e08b935 · e08b935
1 parent b1424f2
commit e08b935
Show file tree

Hide file tree

Showing 98 changed files with 429 additions and 461 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);