Skip to content

Commit

Permalink
adjust details test cases to what newest Nominatim returns
Browse files Browse the repository at this point in the history
  • Loading branch information
mtmail committed Aug 29, 2023
1 parent ff984f7 commit d092630
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 15 deletions.
8 changes: 5 additions & 3 deletions src/pages/DetailsPage.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
function place_has_keywords(aThisPlace) {
// Return false if Nominatim API sends 'keywords: { name: [], address: [] }'
// Like no longer needed after Nominatim version 4.3
return (
aThisPlace.keywords && aThisPlace.keywords.name && aThisPlace.keywords.address
&& (aThisPlace.keywords.name.length > 0 || aThisPlace.keywords.address.length > 0)
Expand Down Expand Up @@ -94,10 +95,11 @@
<table id="locationdetails" class="table table-striped table-responsive">
<tbody>
<InfoRow title="Name">
{#if (Array.isArray(aPlace.names)) }
<span class="noname fw-bold">No Name</span>
{:else}
{#if aPlace.names && typeof (aPlace.names) === 'object'
&& Object.keys(aPlace.names).length}
<InfoRowList items={aPlace.names} />
{:else}
<span class="noname fw-bold">No Name</span>
{/if}
</InfoRow>
<InfoRow title="Type">{aPlace.category}:{aPlace.type}</InfoRow>
Expand Down
40 changes: 28 additions & 12 deletions test/details.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,33 @@ describe('Details Page', function () {
});
}


it('should support case-insenstive search, can navigate to new page', async function () {
let input_field = await page.$('input[type=edit]');
await input_field.click({ clickCount: 3 });
await input_field.type('w375257537');
await page.click('button[type=submit]');

await page.waitForSelector('a[href="https://www.openstreetmap.org/way/375257537"]');
assert.ok((await page.$eval('.container h1', el => el.textContent)).includes('Taj Mahal'));
});
});

describe('With street search - a place that is parent of buildings', function () {
before(async function () {
page = await browser.newPage();
await page.goto('http://localhost:9999/details.html?osmtype=W&osmid=32703083');
await page.waitForSelector('.container .row');
});

after(async function () {
await page.close();
});

it('should change page url on clicking display child places', async function () {
let page_content = await page.$eval('body', el => el.textContent);
assert.ok(page_content.includes('Gafleistrasse'));

let current_url;
let [child_places_btn] = await page.$x("//a[contains(text(), 'display child places')]");

Expand All @@ -98,18 +124,8 @@ describe('Details Page', function () {
current_url = new URL(await page.url());
assert.strictEqual(current_url.searchParams.get('hierarchy'), '1');

let page_content = await page.$eval('body', el => el.textContent);
assert.ok(page_content.includes('Alte Landstrasse')); // one of the streets
});

it('should support case-insenstive search, can navigate to new page', async function () {
let input_field = await page.$('input[type=edit]');
await input_field.click({ clickCount: 3 });
await input_field.type('w375257537');
await page.click('button[type=submit]');

await page.waitForSelector('a[href="https://www.openstreetmap.org/way/375257537"]');
assert.ok((await page.$eval('.container h1', el => el.textContent)).includes('Taj Mahal'));
page_content = await page.$eval('body', el => el.textContent);
assert.ok(page_content.includes('bus_stop')); // parent of several bus stops
});
});

Expand Down

0 comments on commit d092630

Please sign in to comment.