Skip to content
Open
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/frontend/package-lock.json

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

Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ export const PropertyImprovementsListView: React.FunctionComponent<
>
<PropertyImprovementDetails
propertyImprovement={improvement}
propertyImprovementIndex={index}
></PropertyImprovementDetails>
</Section>
</StyledBorder>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,50 @@ import { prettyFormatDate } from '@/utils/dateUtils';

export interface IPropertyImprovementDetailsProps {
propertyImprovement: ApiGen_Concepts_PropertyImprovement;
propertyImprovementIndex?: number;
}

export const PropertyImprovementDetails: React.FunctionComponent<
IPropertyImprovementDetailsProps
> = ({ propertyImprovement }) => {
> = ({ propertyImprovement, propertyImprovementIndex }) => {
return (
<>
<SectionField
labelWidth={{ xs: 4 }}
label="Name"
valueTestId={`improvement[${propertyImprovement.id}].name`}
valueTestId={`improvement[${propertyImprovementIndex}].name`}
>
{propertyImprovement.improvementName ?? ''}
</SectionField>

<SectionField
labelWidth={{ xs: 4 }}
label="Improvement type"
valueTestId={`improvement[${propertyImprovement.id}].type`}
valueTestId={`improvement[${propertyImprovementIndex}].type`}
>
{propertyImprovement.improvementTypeCode?.description}
</SectionField>

<SectionField
labelWidth={{ xs: 4 }}
label="Improvement date"
valueTestId={`improvement[${propertyImprovement.id}].date`}
valueTestId={`improvement[${propertyImprovementIndex}].date`}
>
{prettyFormatDate(propertyImprovement.improvementDate)}
</SectionField>

<SectionField
labelWidth={{ xs: 4 }}
label="Improvement status"
valueTestId={`improvement[${propertyImprovement.id}].status`}
valueTestId={`improvement[${propertyImprovementIndex}].status`}
>
{propertyImprovement.improvementStatusCode?.description}
</SectionField>

<SectionField
label="Description"
labelWidth={{ xs: 4 }}
valueTestId={`improvement[${propertyImprovement.id}].description`}
valueTestId={`improvement[${propertyImprovementIndex}].description`}
>
{propertyImprovement.improvementDescription ?? ''}
</SectionField>
Expand Down
1 change: 0 additions & 1 deletion testing/PIMS.Tests.Automation/Classes/AcquisitionFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ public class Agreement
public string AgreementType { get; set; } = null!;
public string AgreementDate { get; set; } = null!;
public string AgreementCompletionDate { get; set; } = null!;
public string AgreementCommencementDate { get; set; } = null!;
public string AgreementTerminationDate { get; set; } = null!;
public string AgreementPossessionDate { get; set; } = null!;
public string AgreementPurchasePrice { get; set; } = null!;
Expand Down
1 change: 1 addition & 0 deletions testing/PIMS.Tests.Automation/Classes/Lease.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public class Lease
public int RepresentativeNumber { get; set; } = 0;
public int PropertyManagerNumber { get; set; } = 0;
public int UnknownTenantNumber { get; set; } = 0;
public int OtherTenantNumber { get; set; } = 0;
public int OwnerPayeeNumber { get; set; } = 0;
public int OwnerRepresentativeNumber { get; set; } = 0;
public List<Stakeholder> LeaseTenants { get; set; } = new List<Stakeholder>();
Expand Down
3 changes: 3 additions & 0 deletions testing/PIMS.Tests.Automation/Classes/Property.cs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,10 @@ public class SurveyParcel

public class PropertyImprovement
{
public string ImprovementName { get; set; } = null!;
public string ImprovementType { get; set; } = null!;
public string ImprovementStatus { get; set; } = null!;
public string ImprovementDate { get; set; } = null!;
public string ImprovementDescription { get; set; } = null!;
}
}
Binary file modified testing/PIMS.Tests.Automation/Data/PIMS_Testing_Data.xlsx
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
Given I create a new Management File from row number 6
When I add Properties to the Management File
And I create Digital Documents for a "Management File" from row number 14
And I checked related file documents on properties documents
#And I checked related file documents on properties documents

Check notice

Code scanning / CodeQL

Unnecessarily complex Boolean expression Note test

The expression 'A == false' can be simplified to '!A'.
And I edit a Digital Document for a "Management File" from row number 15
Then A new Management file is created or updated successfully

Expand Down

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

4 changes: 2 additions & 2 deletions testing/PIMS.Tests.Automation/Features/ResearchFiles.feature
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
And I edit a Note on the Notes Tab from row number 2
Then A new Research File is created successfully

Scenario: 05._Research_File_from_Pin
Given I create a Research File from a pin on map and from row number 6
Scenario: 05._Research_File_from_Search
Given I create a Research File from a search on map and from row number 6

Check warning

Code scanning / CodeQL

Useless upcast Warning test

There is no need to upcast from
null
to
String[]
- the conversion can be done implicitly.

Check warning

Code scanning / CodeQL

Useless upcast Warning test

There is no need to upcast from
null
to
String
- the conversion can be done implicitly.

Check warning

Code scanning / CodeQL

Useless upcast Warning test

There is no need to upcast from
null
to
Table
- the conversion can be done implicitly.
Then A new Research File is created successfully

Scenario: 06._Research_File_List_View
Expand Down
10 changes: 5 additions & 5 deletions testing/PIMS.Tests.Automation/Features/ResearchFiles.feature.cs

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

20 changes: 10 additions & 10 deletions testing/PIMS.Tests.Automation/PIMS.Tests.Automation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@
<PackageReference Include="ExcelDataReader" Version="3.8.0" />
<PackageReference Include="ExcelDataReader.DataSet" Version="3.8.0" />
<PackageReference Include="ExtentReports" Version="5.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="Reqnroll.SpecFlowCompatibility" Version="3.3.3" />
<PackageReference Include="Reqnroll.xUnit" Version="3.3.3" />
<PackageReference Include="Selenium.Support" Version="4.40.0" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="145.0.7632.7600" />
<PackageReference Include="Selenium.Support" Version="4.41.0" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="146.0.7680.7200" />
<PackageReference Include="Selenium.WebDriver.GeckoDriver" Version="0.36.0" />
<PackageReference Include="FluentAssertions" Version="8.8.0" />
<PackageReference Include="System.Drawing.Common" Version="10.0.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.3" />
<PackageReference Include="System.Text.Json" Version="10.0.3" />
<PackageReference Include="xunit.assert" Version="2.9.3" />
<PackageReference Include="System.Drawing.Common" Version="10.0.5" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.5" />
<PackageReference Include="System.Text.Json" Version="10.0.5" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.v3.assert" Version="3.2.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public class DigitalDocuments: PageObjectBase
private readonly By documentViewElectoralDistrictContent = By.XPath("//label[contains(text(),'Electoral district')]/parent::div/following-sibling::div");
private readonly By documentViewEndDateContent = By.XPath("//label[contains(text(),'End date')]/parent::div/following-sibling::div");
private readonly By documentViewFieldBookContent = By.XPath("//label[contains(text(),'Field book #/Year')]/parent::div/following-sibling::div");
private readonly By documentViewFileNumberContent = By.XPath("//div[@class='pr-0 text-left col-4']/label[contains(text(),'File #')]/parent::div/following-sibling::div");
private readonly By documentViewFileNumberContent = By.XPath("//div[@class='pr-0 text-left col-4']/label[contains(text(),'MoTI file #')]/parent::div/following-sibling::div");
private readonly By documentViewGazetteDateContent = By.XPath("//label[contains(text(),'Gazette date')]/parent::div/following-sibling::div");
private readonly By documentViewGazettePageContent = By.XPath("//label[contains(text(),'Gazette page #')]/parent::div/following-sibling::div");
private readonly By documentViewGazettePublishedDateContent = By.XPath("//label[contains(text(),'Gazette published date')]/parent::div/following-sibling::div");
Expand Down
Loading
Loading