Skip to content

Commit

Permalink
Remove unnecessary jest configuration file (#5258)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
kkokkojeong and HarelM authored Dec 23, 2024
1 parent cf8e2ec commit f967780
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
4 changes: 3 additions & 1 deletion test/integration/browser/browser.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
});

Expand Down
8 changes: 7 additions & 1 deletion test/integration/query/query.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<void>((resolve) => server.listen(resolve));
}, 60000);

Expand Down
13 changes: 9 additions & 4 deletions test/integration/render/run_render_tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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({
Expand Down
6 changes: 0 additions & 6 deletions tsconfig.jest.json

This file was deleted.

0 comments on commit f967780

Please sign in to comment.