Skip to content

Upgrade Vitest, use a real browser for Map Bridges tests #2146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,5 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-
- run: yarn --immutable
- run: yarn playwright install
- run: yarn test
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-typescript": "^11.1.6",
"@symfony/stimulus-testing": "^2.0.1",
"@vitest/browser": "^2.0.5",
"clean-css-cli": "^5.6.2",
"playwright": "^1.47.0",
"rollup": "^4.21.0",
"tslib": "^2.6.3",
"typescript": "^5.5.4",
"vitest": "^0.34.6"
"vitest": "^2.0.5"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config';
import configShared from '../../../vitest.config.js'
import configShared from '../../../vitest.config.mjs'
import path from 'path';

export default mergeConfig(
Expand Down
3 changes: 1 addition & 2 deletions src/Map/src/Bridge/Google/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"devDependencies": {
"@googlemaps/js-api-loader": "^1.16.6",
"@hotwired/stimulus": "^3.0.0",
"@types/google.maps": "^3.55.9",
"happy-dom": "^14.12.3"
"@types/google.maps": "^3.55.9"
}
}
17 changes: 0 additions & 17 deletions src/Map/src/Bridge/Google/assets/vitest.config.js

This file was deleted.

29 changes: 29 additions & 0 deletions src/Map/src/Bridge/Google/assets/vitest.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { defineConfig, mergeConfig } from 'vitest/config';
import configShared from '../../../../../../vitest.config.mjs'

export default mergeConfig(
configShared,
defineConfig({
resolve: {
alias: {
'@symfony/ux-map/abstract-map-controller': __dirname + '/../../../../assets/src/abstract_map_controller.ts',
},
},
define: {
// Prevent the following error:
// ReferenceError: global is not defined
// ❯ ../../../../../../node_modules/pretty-format/build/plugins/AsymmetricMatcher.js ../../../../../../../../../../node_modules/.vite/deps/@testing-library_dom.js:139:19
// ❯ ../../../../../../node_modules/pretty-format/build/index.js ../../../../../../../../../../node_modules/.vite/deps/@testing-library_dom.js:805:7
// ❯ ../../../../../../../../../../node_modules/.vite/deps/@testing-library_dom.js:13445:36
global: {}
},
test: {
browser: {
enabled: true,
provider: 'playwright', // or 'webdriverio'
name: 'chromium', // browser name is required
headless: true,
},
},
})
);
1 change: 0 additions & 1 deletion src/Map/src/Bridge/Leaflet/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"devDependencies": {
"@hotwired/stimulus": "^3.0.0",
"@types/leaflet": "^1.9.12",
"happy-dom": "^14.12.3",
"leaflet": "^1.9.4"
}
}
18 changes: 0 additions & 18 deletions src/Map/src/Bridge/Leaflet/assets/vitest.config.js

This file was deleted.

30 changes: 30 additions & 0 deletions src/Map/src/Bridge/Leaflet/assets/vitest.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { defineConfig, mergeConfig } from 'vitest/config';
import configShared from '../../../../../../vitest.config.mjs'

export default mergeConfig(
configShared,
defineConfig({
resolve: {
alias: {
'@symfony/ux-map/abstract-map-controller': __dirname + '/../../../../assets/src/abstract_map_controller.ts',
'leaflet/dist/leaflet.min.css': 'leaflet/dist/leaflet.css',
},
},
define: {
// Prevent the following error:
// ReferenceError: global is not defined
// ❯ ../../../../../../node_modules/pretty-format/build/plugins/AsymmetricMatcher.js ../../../../../../../../../../node_modules/.vite/deps/@testing-library_dom.js:139:19
// ❯ ../../../../../../node_modules/pretty-format/build/index.js ../../../../../../../../../../node_modules/.vite/deps/@testing-library_dom.js:805:7
// ❯ ../../../../../../../../../../node_modules/.vite/deps/@testing-library_dom.js:13445:36
global: {}
},
test: {
browser: {
enabled: true,
provider: 'playwright', // or 'webdriverio'
name: 'chromium', // browser name is required
headless: true,
},
},
})
);
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// vitest.config.ts
import { defineConfig, mergeConfig } from 'vitest/config';
import react from '@vitejs/plugin-react';
import configShared from '../../../vitest.config.js'
import configShared from '../../../vitest.config.mjs'

export default mergeConfig(
configShared,
defineConfig({
plugins: [react()],
})
);
);
2 changes: 1 addition & 1 deletion src/Svelte/assets/vitest.config.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// vitest.config.ts
import { defineConfig, mergeConfig } from 'vitest/config';
import { svelte } from '@sveltejs/vite-plugin-svelte';
import configShared from '../../../vitest.config.js'
import configShared from '../../../vitest.config.mjs'

export default mergeConfig(
configShared,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig, mergeConfig } from 'vitest/config';
import configShared from '../../../vitest.config.js'
import configShared from '../../../vitest.config.mjs'
import path from 'path';

export default mergeConfig(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// vitest.config.ts
import { defineConfig, mergeConfig } from 'vitest/config';
import vue from '@vitejs/plugin-vue';
import configShared from '../../../vitest.config.js'
import configShared from '../../../vitest.config.mjs'

export default mergeConfig(
configShared,
defineConfig({
plugins: [vue()],
})
);
);
File renamed without changes.
Loading
Loading