jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: fix tests after rebase

Browse source
This commit is contained in:
Yohan Boniface 2024-04-16 10:30:05 +02:00
parent 65bad68efe
commit 2602b27f34
3 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
umap/static/umap/js/umap.js
View file

@ -270,6 +270,7 @@ U.Map = L.Map.extend({
reindexDataLayers: function () { reindexDataLayers: function () {
this.eachDataLayer((datalayer) => datalayer.reindex()) this.eachDataLayer((datalayer) => datalayer.reindex())
this.onDataLayersChanged()
}, },
redrawVisibleDataLayers: function () { redrawVisibleDataLayers: function () {

2
umap/static/umap/js/umap.layer.js
View file

@ -603,7 +603,7 @@ U.DataLayer = L.Evented.extend({
for (let impact of impacts) { for (let impact of impacts) {
switch (impact) { switch (impact) {
case 'ui': case 'ui':
this.map.updateDatalayersControl() this.map.onDataLayersChanged()
break break
case 'data': case 'data':
if (fields.includes('options.type')) { if (fields.includes('options.type')) {

34
umap/tests/integration/test_edit_map.py
View file

@ -24,7 +24,7 @@ def test_can_edit_name(page, live_server, tilelayer):
def test_map_name_impacts_ui(live_server, page, tilelayer): def test_map_name_impacts_ui(live_server, page, tilelayer):
page.goto(f"{live_server.url}/en/map/new/") page.goto(f"{live_server.url}/en/map/new/")
gear_icon = page.get_by_title("Edit map properties") gear_icon = page.get_by_title("Edit map name and caption")
expect(gear_icon).to_be_visible() expect(gear_icon).to_be_visible()
gear_icon.click() gear_icon.click()
@ -39,7 +39,7 @@ def test_map_name_impacts_ui(live_server, page, tilelayer):
def test_zoomcontrol_impacts_ui(live_server, page, tilelayer): def test_zoomcontrol_impacts_ui(live_server, page, tilelayer):
page.goto(f"{live_server.url}/en/map/new/") page.goto(f"{live_server.url}/en/map/new/")
gear_icon = page.get_by_title("Edit map properties") gear_icon = page.get_by_title("Map advanced properties")
expect(gear_icon).to_be_visible() expect(gear_icon).to_be_visible()
gear_icon.click() gear_icon.click()
@ -67,7 +67,7 @@ def test_zoomcontrol_impacts_ui(live_server, page, tilelayer):
def test_map_color_impacts_data(live_server, page, tilelayer): def test_map_color_impacts_data(live_server, page, tilelayer):
page.goto(f"{live_server.url}/en/map/new/") page.goto(f"{live_server.url}/en/map/new/")
gear_icon = page.get_by_title("Edit map properties") gear_icon = page.get_by_title("Map advanced properties")
expect(gear_icon).to_be_visible() expect(gear_icon).to_be_visible()
gear_icon.click() gear_icon.click()
@ -97,7 +97,7 @@ def test_map_color_impacts_data(live_server, page, tilelayer):
def test_limitbounds_impacts_ui(live_server, page, tilelayer): def test_limitbounds_impacts_ui(live_server, page, tilelayer):
page.goto(f"{live_server.url}/en/map/new/") page.goto(f"{live_server.url}/en/map/new/")
gear_icon = page.get_by_title("Edit map properties") gear_icon = page.get_by_title("Map advanced properties")
expect(gear_icon).to_be_visible() expect(gear_icon).to_be_visible()
gear_icon.click() gear_icon.click()
@ -163,37 +163,33 @@ def test_sortkey_impacts_datalayerindex(map, live_server, page):
page.goto(f"{live_server.url}{map.get_absolute_url()}") page.goto(f"{live_server.url}{map.get_absolute_url()}")
# By default, features are sorted by name (Third, Second, First) # By default, features are sorted by name (Third, Second, First)
page.get_by_role("button", name="See data layers").click() page.get_by_role("button", name="See layers").click()
page.get_by_role("button", name="Browse data").click() page.get_by_role("heading", name="Show/hide layer").locator("i").click()
first_listed_feature = page.locator("#browse_data_datalayer_123 > ul > li").nth(0) first_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(0)
second_listed_feature = page.locator("#browse_data_datalayer_123 > ul > li").nth(1) second_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(1)
third_listed_feature = page.locator("#browse_data_datalayer_123 > ul > li").nth(2) third_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(2)
assert "X Third" == first_listed_feature.text_content() assert "X Third" == first_listed_feature.text_content()
assert "Y Second" == second_listed_feature.text_content() assert "Y Second" == second_listed_feature.text_content()
assert "Z First" == third_listed_feature.text_content() assert "Z First" == third_listed_feature.text_content()
# Change the default sortkey to be "key" # Change the default sortkey to be "key"
page.get_by_role("button", name="Edit").click() page.get_by_role("button", name="Edit").click()
page.get_by_role("link", name="Edit map properties").click() page.get_by_role("link", name="Map advanced properties").click()
page.get_by_role("heading", name="Default properties").click() page.get_by_role("heading", name="Default properties").click()
# Click "define" # Click "define"
page.locator( page.locator(".panel .umap-field-sortKey .define").click()
"div:nth-child(5) > .fields > .umap-form > div:nth-child(4) > .header > a:nth-child(2)"
).click()
page.locator('input[name="sortKey"]').click() page.locator('input[name="sortKey"]').click()
page.locator('input[name="sortKey"]').fill("key") page.locator('input[name="sortKey"]').fill("key")
# Click the checkmark to apply the changes # Click the checkmark to apply the changes
page.locator("div:nth-child(4) > div:nth-child(2) > .button").first.click() page.locator(".panel .umap-field-sortKey .blur-button").click()
# Features should be sorted by key (First, Second, Third) # Features should be sorted by key (First, Second, Third)
page.get_by_role("button", name="Browse data").click() first_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(0)
second_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(1)
first_listed_feature = page.locator("#browse_data_datalayer_123 > ul > li").nth(0) third_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(2)
second_listed_feature = page.locator("#browse_data_datalayer_123 > ul > li").nth(1)
third_listed_feature = page.locator("#browse_data_datalayer_123 > ul > li").nth(2)
assert "Z First" == first_listed_feature.text_content() assert "Z First" == first_listed_feature.text_content()
assert "Y Second" == second_listed_feature.text_content() assert "Y Second" == second_listed_feature.text_content()
assert "X Third" == third_listed_feature.text_content() assert "X Third" == third_listed_feature.text_content()