use mapbox-gl-test-suite submodule, bump node deps

This commit is contained in:
Mike Morris
2015-08-26 11:35:08 -04:00
parent 677954822c
commit e3ede563fb
2 changed files with 7 additions and 8 deletions

View File

@@ -19,20 +19,19 @@
],
"dependencies": {
"nan": "^1.9.0",
"node-pre-gyp": "^0.6.7"
"node-pre-gyp": "^0.6.9"
},
"bundledDependencies": [
"node-pre-gyp"
],
"devDependencies": {
"aws-sdk": "^2.1.27",
"aws-sdk": "^2.1.47",
"faucet": "0.0.1",
"mapbox-gl-test-suite": "git://github.com/mapbox/mapbox-gl-test-suite#7251829de9d2804fe02cd8f7acc0e30ea278429d",
"mkdirp": "^0.5.1",
"pngjs": "^0.4.0",
"request": "^2.55.0",
"st": "^0.5.3",
"tape": "^4.0.0"
"request": "^2.61.0",
"st": "^0.5.5",
"tape": "^4.2.0"
},
"scripts": {
"install": "node-pre-gyp install || make node -C ../../",

View File

@@ -9,10 +9,10 @@ var path = require('path');
var mkdirp = require('mkdirp');
var PNG = require('pngjs').PNG;
var compare = require('./compare.js');
var suitePath = path.dirname(require.resolve('mapbox-gl-test-suite/package.json'));
var suitePath = path.join(__dirname, '../../../test/suite');
function template(name) {
return fs.readFileSync(require.resolve('mapbox-gl-test-suite/templates/' + name + '.html.tmpl')).toString();
return fs.readFileSync(path.join(suitePath, 'templates', name + '.html.tmpl')).toString();
}
var results = '';