From debbd08ff0cc41be2947d3de55c44be2cc4d4a64 Mon Sep 17 00:00:00 2001 From: Alexander Shalamov Date: Mon, 11 Mar 2019 09:36:06 +0200 Subject: Revert "[core] Use ES6 import / export syntax for node test harness" This reverts commit c6598fc5da063f9b60204639cd619647cbbc89da. --- package.json | 2 +- platform/node/index.js | 2 +- platform/node/test/js/cancel.test.js | 6 +++--- platform/node/test/js/map.test.js | 10 +++++----- platform/node/test/js/request.test.js | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index cc51245ba1..7462ab751e 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ }, "scripts": { "install": "node-pre-gyp install --fallback-to-build=false || make node", - "test": "tape -r esm platform/node/test/js/**/*.test.js", + "test": "tape platform/node/test/js/**/*.test.js", "test-memory": "node --expose-gc platform/node/test/memory.test.js", "test-suite": "run-s test-render test-query test-expressions", "test-expressions": "node -r esm platform/node/test/expression.test.js", diff --git a/platform/node/index.js b/platform/node/index.js index b5003c69eb..7ac44dd705 100644 --- a/platform/node/index.js +++ b/platform/node/index.js @@ -48,4 +48,4 @@ var Map = function(options) { Map.prototype = mbgl.Map.prototype; Map.prototype.constructor = Map; -export default Object.assign(mbgl, { Map: Map }); +module.exports = Object.assign(mbgl, { Map: Map }); diff --git a/platform/node/test/js/cancel.test.js b/platform/node/test/js/cancel.test.js index d7d3ce2999..17525fb863 100644 --- a/platform/node/test/js/cancel.test.js +++ b/platform/node/test/js/cancel.test.js @@ -1,8 +1,8 @@ 'use strict'; -import mockfs from './../mockfs'; -import mbgl from '../../index'; -import test from'tape'; +var mockfs = require('./../mockfs'); +var mbgl = require('../../index'); +var test = require('tape'); var options = { request: function(req, callback) { diff --git a/platform/node/test/js/map.test.js b/platform/node/test/js/map.test.js index a1290ca761..b21c1519e3 100644 --- a/platform/node/test/js/map.test.js +++ b/platform/node/test/js/map.test.js @@ -1,10 +1,10 @@ 'use strict'; -import test from 'tape'; -import mbgl from '../../index'; -import fs from 'fs'; -import path from 'path'; -import style from '../fixtures/style.json'; +var test = require('tape'); +var mbgl = require('../../index'); +var fs = require('fs'); +var path = require('path'); +var style = require('../fixtures/style.json'); test('Map', function(t) { // This test is skipped because of the req.respond shim in index.js diff --git a/platform/node/test/js/request.test.js b/platform/node/test/js/request.test.js index 3762ccd434..4f8d1cabb0 100644 --- a/platform/node/test/js/request.test.js +++ b/platform/node/test/js/request.test.js @@ -1,8 +1,8 @@ 'use strict'; -import mockfs from '../mockfs'; -import mbgl from '../../index'; -import test from 'tape'; +var mockfs = require('../mockfs'); +var mbgl = require('../../index'); +var test = require('tape'); [ 'sprite_png', 'sprite_json', 'source_vector', 'glyph' ].forEach(function (resource) { test(`render reports an error when the request function responds with an error (${resource})`, function(t) { -- cgit v1.2.1