diff options
author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-09-01 15:51:29 -0400 |
---|---|---|
committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-09-01 15:51:29 -0400 |
commit | 0e79d56b0939de9f4722350a34ab76554a23431c (patch) | |
tree | b4fd9f7dbebfcdde7fb1445d1dc4671daa1607d7 /platform/node/test/js | |
parent | c4c3b5bc71c38fe6d6c0df0ddb38c57dfd2767ab (diff) | |
download | qtlocation-mapboxgl-0e79d56b0939de9f4722350a34ab76554a23431c.tar.gz |
move package.json and binding.gyp to root, drop tiles.tilejson
Diffstat (limited to 'platform/node/test/js')
-rw-r--r-- | platform/node/test/js/consecutive.test.js | 2 | ||||
-rw-r--r-- | platform/node/test/js/gzip.test.js | 9 | ||||
-rw-r--r-- | platform/node/test/js/map.test.js | 14 |
3 files changed, 9 insertions, 16 deletions
diff --git a/platform/node/test/js/consecutive.test.js b/platform/node/test/js/consecutive.test.js index ec4b2968bd..928ca1d837 100644 --- a/platform/node/test/js/consecutive.test.js +++ b/platform/node/test/js/consecutive.test.js @@ -3,7 +3,7 @@ /* jshint node:true */ var test = require('tape'); -var mbgl = require('../..'); +var mbgl = require('../../../..'); var fs = require('fs'); var path = require('path'); diff --git a/platform/node/test/js/gzip.test.js b/platform/node/test/js/gzip.test.js index 9e899604ae..4545a18cf5 100644 --- a/platform/node/test/js/gzip.test.js +++ b/platform/node/test/js/gzip.test.js @@ -3,24 +3,23 @@ /* jshint node: true */ var test = require('tape').test; -var mbgl = require('../..'); +var mbgl = require('../../../..'); var fs = require('fs'); var path = require('path'); var mkdirp = require('mkdirp'); var http = require('http'); var request = require('request'); var st = require('st'); -var style = require('../../test/fixtures/style.json'); +var style = require('../fixtures/style.json'); var PNG = require('pngjs').PNG; var compare = require('../compare.js'); -var dirPath = path.join(path.dirname(require.resolve('../../package.json')), 'test'); -var server = http.createServer(st({ path: dirPath })); +var server = http.createServer(st({ path: path.join(__dirname, '..') })); server.listen(0); function filePath(name) { return ['expected', 'actual', 'diff'].reduce(function(prev, key) { - var dir = path.join('test', key, 'gzip'); + var dir = path.join(__dirname, '..', key, 'gzip'); mkdirp.sync(dir); prev[key] = path.join(dir, name); return prev; diff --git a/platform/node/test/js/map.test.js b/platform/node/test/js/map.test.js index d4a8a77960..09870abaaa 100644 --- a/platform/node/test/js/map.test.js +++ b/platform/node/test/js/map.test.js @@ -3,7 +3,7 @@ /* jshint node: true */ var test = require('tape'); -var mbgl = require('../..'); +var mbgl = require('../../../..'); var fs = require('fs'); var path = require('path'); var mkdirp = require('mkdirp'); @@ -13,7 +13,7 @@ var compare = require('../compare.js'); function filePath(name) { return ['expected', 'actual', 'diff'].reduce(function(prev, key) { - var dir = path.join('test', key, 'map'); + var dir = path.join(__dirname, '..', key, 'map'); mkdirp.sync(dir); prev[key] = path.join(dir, name); return prev; @@ -145,13 +145,7 @@ test('Map', function(t) { t.test('does not immediately trigger any tile loads', function(t) { var map = new mbgl.Map({ request: function(req) { - if (req.url === './fixtures/tiles.tilejson') { - fs.readFile(path.join('test', req.url), function (err, data) { - req.respond(err, {data: data}); - }); - } else { - t.fail('unexpected request ' + req.url); - } + t.fail('unexpected request ' + req.url); }, ratio: 1 }); @@ -168,7 +162,7 @@ test('Map', function(t) { t.test('.render', function(t) { var options = { request: function(req) { - fs.readFile(path.join('test', req.url), function(err, data) { + fs.readFile(path.join(__dirname, '..', req.url), function(err, data) { req.respond(err, { data: data }); }); }, |