From f967780b5d5304de625a4fcc47d01a07272d322d Mon Sep 17 00:00:00 2001 From: Seokcheol Jeong <42694076+kkokkojeong@users.noreply.github.com> Date: Mon, 23 Dec 2024 18:24:44 +0900 Subject: [PATCH] Remove unnecessary jest configuration file (#5258) * Add support for 204 in render tests * Fix ? parameter, downgrade integration tests ubuntu, fix lint * Remove security issue * Fix lint, use no-sandbox for tests to be able to use latest ubuntu * Fix windows failing tests, and security comment. * Fix render tests * Fix lint * Remove unnecessary jest configuration file (tsconfig.jest) * fix integration-ci errors * reset * revert codes (https://github.com/maplibre/maplibre-gl-js/pull/5258\#discussion_r1895398243) --------- Co-authored-by: HarelM --- test/integration/browser/browser.test.ts | 4 +++- test/integration/query/query.test.ts | 8 +++++++- test/integration/render/run_render_tests.ts | 13 +++++++++---- tsconfig.jest.json | 6 ------ 4 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 tsconfig.jest.json diff --git a/test/integration/browser/browser.test.ts b/test/integration/browser/browser.test.ts index be857b3b1a..4b3e0489b3 100644 --- a/test/integration/browser/browser.test.ts +++ b/test/integration/browser/browser.test.ts @@ -28,8 +28,10 @@ describe('Browser tests', () => { browser = await puppeteer.launch({ headless: true, args: [ + '--enable-webgl', '--use-gl=angle', - '--use-angle=gl' + '--use-angle=gl', + '--no-sandbox', ], }); diff --git a/test/integration/query/query.test.ts b/test/integration/query/query.test.ts index 6d22b82fc1..ea3d370e84 100644 --- a/test/integration/query/query.test.ts +++ b/test/integration/query/query.test.ts @@ -131,7 +131,13 @@ describe('query tests', () => { cors: true, }) ); - browser = await puppeteer.launch({headless: true}); + browser = await puppeteer.launch({ + headless: true, + args: [ + '--enable-webgl', + '--no-sandbox', + ], + }); await new Promise((resolve) => server.listen(resolve)); }, 60000); diff --git a/test/integration/render/run_render_tests.ts b/test/integration/render/run_render_tests.ts index 0f0851c29f..f85ac624d6 100644 --- a/test/integration/render/run_render_tests.ts +++ b/test/integration/render/run_render_tests.ts @@ -301,7 +301,7 @@ async function getImageFromStyle(styleForTest: StyleWithTestData, page: Page): P }`; const fragmentSource = `#version 300 es - + out highp vec4 fragColor; void main() { fragColor = vec4(1.0, 0.0, 0.0, 1.0); @@ -452,7 +452,7 @@ async function getImageFromStyle(styleForTest: StyleWithTestData, page: Page): P // Inject MapLibre projection code ${shaderDescription.vertexShaderPrelude} ${shaderDescription.define} - + in vec3 a_pos; void main() { @@ -982,8 +982,13 @@ async function executeRenderTests() { options.openBrowser = checkParameter(options, '--open-browser'); } - const browser = await puppeteer.launch({headless: !options.openBrowser, args: ['--enable-webgl', '--no-sandbox', - '--disable-web-security']}); + const browser = await puppeteer.launch({ + headless: !options.openBrowser, + args: [ + '--enable-webgl', + '--no-sandbox', + '--disable-web-security' + ]}); const server = http.createServer( st({ diff --git a/tsconfig.jest.json b/tsconfig.jest.json deleted file mode 100644 index 620d3ea838..0000000000 --- a/tsconfig.jest.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "target": "ES2019" - } -}