Skip to content
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
4 changes: 2 additions & 2 deletions source/backend/api/Pims.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
<Version>6.0.0-117.32</Version>
<AssemblyVersion>6.0.0.117</AssemblyVersion>
<Version>6.1.0-118.0</Version>
<AssemblyVersion>6.1.0.118</AssemblyVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<ProjectGuid>{16BC0468-78F6-4C91-87DA-7403C919E646}</ProjectGuid>
<TargetFramework>net8.0</TargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions source/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion source/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "6.0.0-117.32",
"version": "6.1.0-118.0",
"private": true,
"dependencies": {
"@bcgov/bc-sans": "1.0.1",
Expand Down
55 changes: 28 additions & 27 deletions testing/playwright-testing/support/pages/SearchProperties.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ class SearchProperties {
await this.page.getByTestId("geographic-name-input").fill(poiName);
await expect(
this.page.locator(
"div[data-placement='bottom-start'] ul[class='suggestionList']",
),
"div[data-placement='bottom-start'] ul[class='suggestionList']"
)
).toBeVisible();
await this.page
.locator(
"div[data-placement='bottom-start'] ul[class='suggestionList'] li:first-child",
"div[data-placement='bottom-start'] ul[class='suggestionList'] li:first-child"
)
.click();
await this.page.getByTestId("search").click();
Expand Down Expand Up @@ -146,7 +146,7 @@ class SearchProperties {
.click();

const quickInfoCloseBttn = await this.page.locator(
"div[data-testid='quick-info-header'] *[data-testid='close-icon']",
"div[data-testid='quick-info-header'] *[data-testid='close-icon']"
);
if (await quickInfoCloseBttn.isVisible()) {
await quickInfoCloseBttn.click();
Expand Down Expand Up @@ -174,27 +174,27 @@ class SearchProperties {
async selectNthPIMSSearchResult(index) {
await this.page
.locator(
`div[data-testid="pims-search-results-section"] div[data-testid="search-property-${index}"]`,
`div[data-testid="pims-search-results-section"] div[data-testid="search-property-${index}"]`
)
.waitFor({ status: "visible" });
await this.page
.locator(
`div[data-testid="pims-search-results-section"] div[data-testid="search-property-${index}"]`,
`div[data-testid="pims-search-results-section"] div[data-testid="search-property-${index}"]`
)
.click();
}

async closePropertyLeaflet() {
const closeLeafketBttn = await this.page.locator(
"div[data-testid='leaflet-buttons-section'] *[data-testid='close-leaflet-button']",
"div[data-testid='leaflet-buttons-section'] *[data-testid='close-leaflet-button']"
);
await closeLeafketBttn.waitFor({ status: "visible" });
await closeLeafketBttn.click();
}

async selectPinOnMap() {
const pinOnMap = await this.page.locator(
"div[class='leaflet-pane leaflet-marker-pane'] img:first-child",
"div[class='leaflet-pane leaflet-marker-pane'] img:first-child"
);
await pinOnMap.waitFor({ status: "visible" });
await pinOnMap.click({ force: true });
Expand Down Expand Up @@ -246,7 +246,7 @@ class SearchProperties {
async addPropertyToWorklistFromQuickInfo() {
await this.page
.locator(
"div[data-testid='quick-info'] div[data-testid='filter-backdrop-loading']",
"div[data-testid='quick-info'] div[data-testid='filter-backdrop-loading']"
)
.waitFor({ state: "hidden" });
await this.page
Expand All @@ -257,19 +257,20 @@ class SearchProperties {
.click();
await this.page
.locator(
"div[aria-labelledBy='dropdown-ellipsis'] a[aria-label='Add to Working List']",
"div[aria-labelledBy='dropdown-ellipsis'] a[aria-label='Add to Working List']"
)
.waitFor({ status: "visible" });
await this.page
.locator(
"div[aria-labelledBy='dropdown-ellipsis'] a[aria-label='Add to Working List']",
"div[aria-labelledBy='dropdown-ellipsis'] a[aria-label='Add to Working List']"
)
.click();
}

async verifySearchControlForm() {
const searchPropertiesSidebar =
await this.page.getByTestId("search-sidebar");
const searchPropertiesSidebar = await this.page.getByTestId(
"search-sidebar"
);
expect(searchPropertiesSidebar).toBeVisible();

const searchTitle = await this.page
Expand Down Expand Up @@ -304,39 +305,39 @@ class SearchProperties {
expect(resetButton).toBeVisible();

const PMBCResultsTitle = await this.page.locator(
"//div[text()='Results (PMBC)']",
"//div[text()='Results (PMBC)']"
);
expect(PMBCResultsTitle).toBeVisible();

const PMBCResultsMoreOptions = await this.page.locator(
"button[aria-label='search pmbc results more options']",
"button[aria-label='search pmbc results more options']"
);
expect(PMBCResultsMoreOptions).toBeVisible();

const PIMSResultsTitle = await this.page.locator(
"//div[text()='Results (PIMS)']",
"//div[text()='Results (PIMS)']"
);
expect(PIMSResultsTitle).toBeVisible();

const PIMSResultsMoreOptions = await this.page.locator(
"button[aria-label='search pims results more options']",
"button[aria-label='search pims results more options']"
);
expect(PIMSResultsMoreOptions).toBeVisible();
}

async verifyPropertyQuickInfo() {
const quickInfoLeaflet = await this.page.locator(
"div[data-testid='quick-info']",
"div[data-testid='quick-info']"
);
expect(quickInfoLeaflet).toBeVisible({ timeout: 120000 });

const quickInfoViewIcon = await this.page.locator(
"div[data-testid='view-property-icon']",
"div[data-testid='view-property-icon']"
);
expect(quickInfoViewIcon).toBeVisible({ timeout: 120000 });

const quickInfoMorOptions = await this.page.locator(
"button[data-testid='quick-info-more-options']",
"button[data-testid='quick-info-more-options']"
);
expect(quickInfoMorOptions).toBeVisible({ timeout: 120000 });

Expand All @@ -349,29 +350,29 @@ class SearchProperties {
expect(quickInfoZoom).toBeVisible({ timeout: 120000 });

const quickInfoMinimize = await this.page.getByTestId(
"*[data-testid='toggle-icon']",
"*[data-testid='toggle-icon']"
);
expect(quickInfoMinimize).toBeVisible({ timeout: 120000 });

const quickInfoCloseIcon = await this.page.locator(
"*[data-testid='close-icon']",
"*[data-testid='close-icon']"
);
expect(quickInfoCloseIcon).toBeVisible({ timeout: 120000 });
}

async verifyMultiplePropertyPopup() {
const popupTitle = await this.page.locator(
"//div[@class='leaflet-popup-content']/div/div[text()='Multiple properties found']",
"//div[@class='leaflet-popup-content']/div/div[text()='Multiple properties found']"
);
expect(popupTitle).toBeVisible({ timeout: 12000 });

const closeButton = await this.page.locator(
"div[class='leaflet-popup-content'] button[title='close']",
"div[class='leaflet-popup-content'] button[title='close']"
);
expect(closeButton).toBeVisible({ timeout: 12000 });

const commonPropertyDiv = await this.page.locator(
"//div[@class='leaflet-popup-content']/div/div/div/div[contains(text(),'Common Property')]",
"//div[@class='leaflet-popup-content']/div/div/div/div[contains(text(),'Common Property')]"
);
expect(commonPropertyDiv).toBeVisible({ timeout: 12000 });

Expand All @@ -381,14 +382,14 @@ class SearchProperties {
expect(parseInt(propertiesPID)).toBeGreaterThan(1);

const addWorklistBttn = await this.page.locator(
"//div[@class='leaflet-popup-content']/div/button[2]",
"//div[@class='leaflet-popup-content']/div/button[2]"
);
expect(addWorklistBttn).toBeVisible({ timeout: 12000 });
}

async closeMultiplePropertyPopup() {
const closeButton = await this.page.locator(
"div[class='leaflet-popup-content'] button[title='close']",
"div[class='leaflet-popup-content'] button[title='close']"
);
await closeButton.click();
}
Expand Down
Loading