Skip to content
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

Tests - Add embed base layers in the test project #4850

Merged
merged 3 commits into from
Oct 7, 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
40 changes: 20 additions & 20 deletions .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,16 @@ jobs:
cd end2end
npx playwright test --project=end2end

- name: Generate PG dump from Playwright
if: failure()
run: |
./lizmap-ctl dump-pgsql

- name: Check the database diff from Playwright
if: failure()
run: |
git diff qgis-projects/tests/tests_dataset.sql
git restore qgis-projects/tests/tests_dataset.sql
# - name: Generate PG dump from Playwright
# if: failure()
# run: |
# ./lizmap-ctl dump-pgsql
#
# - name: Check the database diff from Playwright
# if: failure()
# run: |
# git diff qgis-projects/tests/tests_dataset.sql
# git restore qgis-projects/tests/tests_dataset.sql

- name: Notify in case of playwright failure, from mainstream branches only
uses: peter-evans/commit-comment@v3
Expand Down Expand Up @@ -193,16 +193,16 @@ jobs:
tests/end2end/cypress/screenshots
tests/end2end/cypress/downloads

- name: Generate PG dump from Cypress
if: failure()
run: |
./lizmap-ctl dump-pgsql

- name: Check the database diff from Cypress
if: failure()
run: |
git diff qgis-projects/tests/tests_dataset.sql
git restore qgis-projects/tests/tests_dataset.sql
# - name: Generate PG dump from Cypress
# if: failure()
# run: |
# ./lizmap-ctl dump-pgsql
#
# - name: Check the database diff from Cypress
# if: failure()
# run: |
# git diff qgis-projects/tests/tests_dataset.sql
# git restore qgis-projects/tests/tests_dataset.sql

# [[ -z $(git status --porcelain -uno) ]]
# exit $?
Expand Down
2 changes: 1 addition & 1 deletion tests/end2end/playwright/embedded-form.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { gotoMap } from './globals';

test.describe('Edition of an embedded layer', () => {
test.beforeEach(async ({ page }) => {
const url = '/index.php/view/map/?repository=testsrepository&project=edition_embed';
const url = '/index.php/view/map/?repository=testsrepository&project=embed_child';
await gotoMap(url, page);
await page.locator('#dock-close').click();
});
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{
"metadata": {
"qgis_desktop_version": 32815,
"lizmap_plugin_version_str": "4.1.8",
"lizmap_plugin_version": 40108,
"qgis_desktop_version": 33411,
"lizmap_plugin_version_str": "4.4.3-alpha",
"lizmap_plugin_version": 40403,
"lizmap_web_client_target_version": 30800,
"lizmap_web_client_target_status": "Dev",
"instance_target_url": "http://localhost:8130/",
"instance_target_repository": "intranet"
"lizmap_web_client_target_status": "Stable",
"instance_target_url": "https://demo.lizmap.com/lizmap/"
},
"warnings": {},
"debug": {
"total_time": 0.33000000000000007
},
"options": {
"projection": {
"proj4": "+proj=longlat +datum=WGS84 +no_defs",
Expand All @@ -28,8 +30,8 @@
250000,
500000
],
"minScale": 1,
"maxScale": 1000000000,
"minScale": 10000,
"maxScale": 500000,
"use_native_zoom_levels": false,
"hide_numeric_scale_value": false,
"initialExtent": [
Expand All @@ -42,6 +44,7 @@
"pointTolerance": 25,
"lineTolerance": 10,
"polygonTolerance": 5,
"automatic_permalink": true,
"tmTimeFrameSize": 10,
"tmTimeFrameType": "seconds",
"tmAnimationFrameLength": 1000,
Expand Down Expand Up @@ -152,6 +155,103 @@
"imageFormat": "image/png",
"cached": "False",
"clientCacheExpiration": 300
},
"baselayers": {
"id": "baselayers",
"name": "baselayers",
"type": "group",
"title": "baselayers",
"abstract": "",
"link": "",
"minScale": 1,
"maxScale": 1000000000000,
"toggled": "True",
"popup": "False",
"popupSource": "auto",
"popupTemplate": "",
"popupMaxFeatures": 10,
"popupDisplayChildren": "False",
"popup_allow_download": true,
"legend_image_option": "hide_at_startup",
"groupAsLayer": "False",
"baseLayer": "False",
"displayInLegend": "True",
"group_visibility": [],
"singleTile": "True",
"imageFormat": "image/png",
"cached": "False",
"clientCacheExpiration": 300
},
"polygons": {
"id": "polygons_1aca34fc_404d_4a6f_83c7_506c98de777d",
"name": "polygons",
"type": "layer",
"geometryType": "polygon",
"extent": [
416354.4989291718,
5394257.51030597,
439751.8187472364,
5417234.008469306
],
"crs": "EPSG:3857",
"title": "polygons",
"abstract": "",
"link": "",
"minScale": 1,
"maxScale": 1000000000000,
"toggled": "False",
"popup": "False",
"popupSource": "auto",
"popupTemplate": "",
"popupMaxFeatures": 10,
"popupDisplayChildren": "False",
"popup_allow_download": true,
"legend_image_option": "hide_at_startup",
"groupAsLayer": "False",
"baseLayer": "False",
"displayInLegend": "True",
"group_visibility": [],
"singleTile": "True",
"imageFormat": "image/png",
"cached": "False",
"clientCacheExpiration": 300,
"sourceRepository": "testsrepository",
"sourceProject": "embed_parent"
},
"OpenStreetMap": {
"id": "OpenStreetMap_c1bded8c_5103_40f8_a317_9a712845ddb4",
"name": "OpenStreetMap",
"type": "layer",
"extent": [
-20037508.342789244,
-20037508.342789248,
20037508.342789244,
20037508.342789248
],
"crs": "EPSG:3857",
"title": "OpenStreetMap",
"abstract": "",
"link": "",
"minScale": 1,
"maxScale": 1000000000000,
"toggled": "False",
"popup": "False",
"popupSource": "auto",
"popupTemplate": "",
"popupMaxFeatures": 10,
"popupDisplayChildren": "False",
"popup_allow_download": true,
"legend_image_option": "hide_at_startup",
"groupAsLayer": "False",
"baseLayer": "False",
"displayInLegend": "True",
"group_visibility": [],
"singleTile": "True",
"imageFormat": "image/png",
"cached": "False",
"clientCacheExpiration": 300,
"sourceRepository": "testsrepository",
"sourceProject": "embed_parent"
}
},
"atlas": {
Expand Down Expand Up @@ -229,7 +329,6 @@
},
"edition_layer_embed_child": {
"layerId": "edition_layer_embed_child_d87f81cd_26d2_4c40_820d_676ba03ff6ab",
"snap_layers": [],
"snap_vertices": "False",
"snap_segments": "False",
"snap_intersections": "False",
Expand Down Expand Up @@ -259,7 +358,7 @@
"datavizLayers": {},
"filter_by_polygon": {
"config": {
"polygon_layer_id": null,
"polygon_layer_id": "polygons_1aca34fc_404d_4a6f_83c7_506c98de777d",
"group_field": "",
"filter_by_user": false
},
Expand Down
Loading
Loading