Skip to content

Commit

Permalink
Linting corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
@asanchezr
asanchezr committed Feb 23, 2024
1 parent 210337b commit ae25b97
Show file tree
Hide file tree
Showing 15 changed files with 63 additions and 47 deletions.
3 changes: 2 additions & 1 deletion source/frontend/src/components/maps/leaflet/Layers/util.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ describe('mapUtils tests', () => {
{
...feature,
properties: {
...EmptyPropertyLocation, PROPERTY_ID: '1',
...EmptyPropertyLocation,
PROPERTY_ID: '1',
IS_OWNED: true,
IS_PROPERTY_OF_INTEREST: true,
},
Expand Down
2 changes: 1 addition & 1 deletion source/frontend/src/features/disposition/list/DispositionListView.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('Disposition List View', () => {
it('searches by pid', async () => {
const results = mockPagedResults([
{
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileProperties: [
{
id: 12,
Expand Down
8 changes: 4 additions & 4 deletions .../src/features/disposition/list/DispositionSearchResults/DispositionSearchResults.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ describe('Disposition search results table', () => {
setup({
results: [
DispositionSearchResultModel.fromApi({
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileProperties: [
{
id: 100,
Expand Down Expand Up @@ -127,7 +127,7 @@ describe('Disposition search results table', () => {
setup({
results: [
DispositionSearchResultModel.fromApi({
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
dispositionTeam: [
{
id: 1,
Expand Down Expand Up @@ -171,7 +171,7 @@ describe('Disposition search results table', () => {
setup({
results: [
DispositionSearchResultModel.fromApi({
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
dispositionTeam: [
{
id: 1,
Expand Down Expand Up @@ -216,7 +216,7 @@ describe('Disposition search results table', () => {
setup({
results: [
DispositionSearchResultModel.fromApi({
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
dispositionTeam: [
{
id: 1,
Expand Down
1 change: 0 additions & 1 deletion source/frontend/src/features/mapSideBar/disposition/DispositionContainer.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ describe('DispositionContainer component', () => {
expect(
mockAxios.history.put.filter(x => x.url === '/dispositionfiles/1/properties?'),
).toHaveLength(1);

});

it('should show error popup when user adds a property outside of the user account regions', async () => {
Expand Down
2 changes: 1 addition & 1 deletion source/frontend/src/features/mapSideBar/disposition/DispositionView.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ describe('DispositionView component', () => {
{...{
...props,
dispositionFile: {
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileProperties: mockDispositionFilePropertyResponse() as any,
},
}}
Expand Down
6 changes: 2 additions & 4 deletions source/frontend/src/features/mapSideBar/disposition/common/DispositionHeader.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ describe('DispositionHeader component', () => {
});

it('renders the file number and name concatenated', async () => {
const testDispositionFile =
mockDispositionFileResponse();
const testDispositionFile = mockDispositionFileResponse();
const { getByText } = setup({ dispositionFile: testDispositionFile, lastUpdatedBy: null });

expect(getByText('File:')).toBeVisible();
Expand All @@ -70,8 +69,7 @@ describe('DispositionHeader component', () => {

it('renders the last-update-time when provided', async () => {
const testDate = new Date().toISOString();
const testDispositionFile =
mockDispositionFileResponse();
const testDispositionFile = mockDispositionFileResponse();
const { getByText } = setup({
dispositionFile: testDispositionFile,
lastUpdatedBy: {
Expand Down
4 changes: 2 additions & 2 deletions source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ describe('DispositionMenu component', () => {
const { queryByTitle, queryByTestId } = setup(
{
dispositionFile: {
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileStatusTypeCode: toTypeCode(DispositionFileStatus.Complete),
},
items: testData,
Expand All @@ -147,7 +147,7 @@ describe('DispositionMenu component', () => {
const { queryByTitle, queryByTestId } = setup(
{
dispositionFile: {
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileStatusTypeCode: toTypeCode(DispositionFileStatus.Complete),
},
items: testData,
Expand Down
3 changes: 1 addition & 2 deletions source/frontend/src/features/mapSideBar/disposition/tabs/DispositionFileTabs.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ jest.mock('@/hooks/repositories/useDispositionProvider', () => ({
const history = createMemoryHistory();
const setIsEditing = jest.fn();

const mockDispositionFileResponseApi =
mockDispositionFileResponse();
const mockDispositionFileResponseApi = mockDispositionFileResponse();

describe('DispositionFileTabs component', () => {
// render component under test
Expand Down
10 changes: 4 additions & 6 deletions ...c/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ jest.mock('@react-keycloak/web');

const onEdit = jest.fn();

const mockDispositionFileApi =
mockDispositionFileResponse();
const mockDispositionFileApi = mockDispositionFileResponse();

describe('DispositionSummaryView component', () => {
// render component under test
Expand Down Expand Up @@ -66,8 +65,7 @@ describe('DispositionSummaryView component', () => {
it('does not render the edit button for users that do not have disposition edit permissions', async () => {
const { queryByTitle, queryByTestId } = setup(
{
dispositionFile:
mockDispositionFileResponse(),
dispositionFile: mockDispositionFileResponse(),
},
{ claims: [] },
);
Expand All @@ -82,7 +80,7 @@ describe('DispositionSummaryView component', () => {
const { queryByTitle, queryByTestId } = setup(
{
dispositionFile: {
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileStatusTypeCode: toTypeCode(DispositionFileStatus.Complete),
},
},
Expand All @@ -99,7 +97,7 @@ describe('DispositionSummaryView component', () => {
const { queryByTitle, queryByTestId } = setup(
{
dispositionFile: {
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileStatusTypeCode: toTypeCode(DispositionFileStatus.Complete),
},
},
Expand Down
4 changes: 1 addition & 3 deletions ...ures/mapSideBar/disposition/tabs/fileDetails/detail/update/UpdateDispositionForm.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ describe('UpdateDispositionForm component', () => {
let initialValues: DispositionFormModel;

beforeEach(() => {
initialValues = DispositionFormModel.fromApi(
mockDispositionFileResponse(),
);
initialValues = DispositionFormModel.fromApi(mockDispositionFileResponse());
});

afterEach(() => {
Expand Down
5 changes: 1 addition & 4 deletions ...nd/src/features/mapSideBar/disposition/tabs/offersAndSale/OffersAndSaleContainer.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,7 @@ describe('OffersAndSale Container component', () => {
) => {
const component = render(
<OffersAndSaleContainer
dispositionFile={
renderOptions?.props?.dispositionFile ??
(mockDispositionFileResponse())
}
dispositionFile={renderOptions?.props?.dispositionFile ?? mockDispositionFileResponse()}
View={TestView}
onSuccess={onSuccess}
/>,
Expand Down
14 changes: 9 additions & 5 deletions ...rontend/src/features/mapSideBar/disposition/tabs/offersAndSale/OffersAndSaleView.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ import { toTypeCode } from '@/utils/formUtils';
const history = createMemoryHistory();
jest.mock('@react-keycloak/web');

const mockDispositionFileApi = mockDispositionFileResponse(1) as unknown as ApiGen_Concepts_DispositionFile;
const mockDispositionFileApi = mockDispositionFileResponse(
1,
) as unknown as ApiGen_Concepts_DispositionFile;
const mockDispositionSaleApi = mockDispositionFileSaleApi(1);

const onDelete = jest.fn();
Expand Down Expand Up @@ -79,7 +81,9 @@ describe('Disposition Offer Detail View component', () => {
});

it('displays the Disposition Appraisal and Value when available', async () => {
const mockDisposition = mockDispositionFileResponse(1) as unknown as ApiGen_Concepts_DispositionFile;
const mockDisposition = mockDispositionFileResponse(
1,
) as unknown as ApiGen_Concepts_DispositionFile;

const { queryByTestId } = await setup({
props: {
Expand Down Expand Up @@ -136,7 +140,7 @@ describe('Disposition Offer Detail View component', () => {
const { queryByTitle, queryByTestId } = await setup({
props: {
dispositionFile: {
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileStatusTypeCode: toTypeCode(DispositionFileStatus.Complete),
},
},
Expand Down Expand Up @@ -185,7 +189,7 @@ describe('Disposition Offer Detail View component', () => {
const { queryByTitle, queryByTestId } = await setup({
props: {
dispositionFile: {
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileStatusTypeCode: toTypeCode(DispositionFileStatus.Complete),
},
},
Expand All @@ -204,7 +208,7 @@ describe('Disposition Offer Detail View component', () => {
const { queryByTitle, queryByTestId } = await setup({
props: {
dispositionFile: {
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileStatusTypeCode: toTypeCode(DispositionFileStatus.Complete),
},
},
Expand Down
9 changes: 3 additions & 6 deletions ...s/offersAndSale/dispositionOffer/dispositionOfferDetails/DispositionOfferDetails.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ describe('Disposition Offer Detail View component', () => {
index={0}
dispositionOffer={renderOptions.props?.dispositionOffer ?? mockDispositionOffer}
onDelete={onDelete}
dispositionFile={
renderOptions.props?.dispositionFile ??
(mockDispositionFileResponse())
}
dispositionFile={renderOptions.props?.dispositionFile ?? mockDispositionFileResponse()}
/>,
{
...renderOptions,
Expand Down Expand Up @@ -89,7 +86,7 @@ describe('Disposition Offer Detail View component', () => {
claims: [Claims.DISPOSITION_EDIT],
props: {
dispositionFile: {
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileStatusTypeCode: toTypeCode(DispositionFileStatus.Complete),
},
},
Expand All @@ -108,7 +105,7 @@ describe('Disposition Offer Detail View component', () => {
roles: [Roles.SYSTEM_ADMINISTRATOR],
props: {
dispositionFile: {
...(mockDispositionFileResponse()),
...mockDispositionFileResponse(),
fileStatusTypeCode: toTypeCode(DispositionFileStatus.Complete),
},
},
Expand Down
3 changes: 2 additions & 1 deletion source/frontend/src/features/mapSideBar/shared/tabs/checklist/detail/ChecklistView.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ describe('ChecklistView component', () => {
};

beforeEach(() => {
mockViewProps.apiFile = mockDispositionFileResponse() as unknown as ApiGen_Concepts_FileWithChecklist;
mockViewProps.apiFile =
mockDispositionFileResponse() as unknown as ApiGen_Concepts_FileWithChecklist;
mockViewProps.apiFile.fileChecklistItems = mockFileChecklistResponse();
});

Expand Down
36 changes: 30 additions & 6 deletions source/frontend/src/utils/mapPropertyUtils.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,36 @@ describe('mapPropertyUtils', () => {
it.each([
[false, { label: NameSourceType.NONE, value: '' }, { ...getEmptyFileProperty() }],
[false, { label: NameSourceType.NONE, value: '' }, undefined],
[false, { label: NameSourceType.NONE, value: '' }, { ...getEmptyFileProperty(), propertyName: '' }],
[false, { label: NameSourceType.NONE, value: '' }, { ...getEmptyFileProperty(), propertyName: null }],
[false, { label: NameSourceType.NAME, value: 'name' }, { ...getEmptyFileProperty(), propertyName: 'name' }],
[true, { label: NameSourceType.NONE, value: '' }, { ...getEmptyFileProperty(), propertyName: 'name' }],
[false, { label: NameSourceType.NONE, value: '' }, { ...getEmptyFileProperty(), property: null }],
[false, { label: NameSourceType.PID, value: '000-000-001' }, { ...getEmptyFileProperty(), property: { ...getEmptyProperty(), pid: 1 } }],
[
false,
{ label: NameSourceType.NONE, value: '' },
{ ...getEmptyFileProperty(), propertyName: '' },
],
[
false,
{ label: NameSourceType.NONE, value: '' },
{ ...getEmptyFileProperty(), propertyName: null },
],
[
false,
{ label: NameSourceType.NAME, value: 'name' },
{ ...getEmptyFileProperty(), propertyName: 'name' },
],
[
true,
{ label: NameSourceType.NONE, value: '' },
{ ...getEmptyFileProperty(), propertyName: 'name' },
],
[
false,
{ label: NameSourceType.NONE, value: '' },
{ ...getEmptyFileProperty(), property: null },
],
[
false,
{ label: NameSourceType.PID, value: '000-000-001' },
{ ...getEmptyFileProperty(), property: { ...getEmptyProperty(), pid: 1 } },
],
])(
'getFilePropertyName test with ignore name flag %p expecting %p source %p',
(skipName: boolean, expectedName: PropertyName, mapProperty?: ApiGen_Concepts_FileProperty) => {
Expand Down

0 comments on commit ae25b97

Please sign in to comment.