From 92c7d29d6a40d6974b4923e858f808ed68886d63 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 13 Sep 2017 09:34:06 -0400 Subject: [node] Reflect GL JS changes in render.test.js --- mapbox-gl-js | 2 +- platform/node/test/render.test.js | 46 +-------------------------------------- 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/mapbox-gl-js b/mapbox-gl-js index c346dec5e3..c25cde1762 160000 --- a/mapbox-gl-js +++ b/mapbox-gl-js @@ -1 +1 @@ -Subproject commit c346dec5e3b55257820f1377a139579982bc95ff +Subproject commit c25cde17624a7a23856aba342ecfa89b2eca84fa diff --git a/platform/node/test/render.test.js b/platform/node/test/render.test.js index b4933ce59e..812a531f20 100644 --- a/platform/node/test/render.test.js +++ b/platform/node/test/render.test.js @@ -4,48 +4,4 @@ const suite = require('../../../mapbox-gl-js/test/integration').render; const suiteImplementation = require('./suite_implementation'); const ignores = require('./ignores.json'); -let tests; -let shuffle = false; -let recycleMap = false; -let seed; - -// https://stackoverflow.com/a/1349426/229714 -function makeHash() { - const array = []; - const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - - for (let i = 0; i < 10; ++i) - array.push(possible.charAt(Math.floor(Math.random() * possible.length))); - - // join array elements without commas. - return array.join(''); -} - -function checkParameter(param) { - const index = tests.indexOf(param); - if (index === -1) - return false; - tests.splice(index, 1); - return true; -} - -function checkValueParameter(defaultValue, param) { - const index = tests.findIndex((elem) => { return String(elem).startsWith(param); }); - if (index === -1) - return defaultValue; - - const split = String(tests.splice(index, 1)).split('='); - if (split.length !== 2) - return defaultValue; - - return split[1]; -} - -if (process.argv[1] === __filename && process.argv.length > 2) { - tests = process.argv.slice(2).filter((value, index, self) => { return self.indexOf(value) === index; }); - shuffle = checkParameter('--shuffle'); - seed = checkValueParameter(makeHash(), '--seed'); - recycleMap = checkParameter('--recycle-map'); -} - -suite.run('native', { tests, ignores, shuffle, seed, recycleMap }, suiteImplementation); +suite.run('native', ignores, suiteImplementation); -- cgit v1.2.1