Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add entity conflict summary table with limited tests #894

Merged
merged 4 commits into from
Nov 23, 2023

Conversation

matthew-white
Copy link
Member

No description provided.

@matthew-white matthew-white requested a review from ktuite November 22, 2023 00:00
Copy link
Member

@ktuite ktuite left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be exciting to get merged!

Copy link
Member Author

@matthew-white matthew-white left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Notes from interactive review.

We didn't review the changes to test/.

src/components/entity/resolve.vue Show resolved Hide resolved
src/components/entity/conflict-table.vue Outdated Show resolved Hide resolved
src/components/entity/conflict-table.vue Show resolved Hide resolved
@matthew-white matthew-white merged commit 2d2e943 into master Nov 23, 2023
1 check passed
@matthew-white matthew-white deleted the entity-conflict-table branch November 23, 2023 02:32
@matthew-white matthew-white changed the title Add entity conflict summary table without tests Add entity conflict summary table with limited tests Nov 23, 2023
Copy link
Member Author

@matthew-white matthew-white left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ktuite and I just reviewed the changes to test/. I still have more tests to write, but I wanted to review the changes that I had made.

We also reviewed some of the changes to src/ from f87db2c.

const button = component.get('.entity-metadata-row:nth-child(2) .resolve-button');
return button.trigger('click');
})
.respondWithData(relevantToConflict)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Return different data for the first and second entities.

entity: testData.entityOData().value[0]
});
})
.respondWithData(relevantToConflict)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Return different data for the different entity.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add entity conflict summary table
2 participants