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.

Sign up for GitHub

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

Jump to bottom

feat: Enhanced conflict review #1195

Merged
merged 33 commits into from
Sep 17, 2024
Merged

feat: Enhanced conflict review #1195

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a521981
Basic routing
stalgiag Aug 13, 2024
568fdcc
Disclosure with content
stalgiag Aug 13, 2024
4407ada
Better styling for conflicts table, correct test index
stalgiag Aug 14, 2024
7666a14
Unexpected behaviors conflicts as well
stalgiag Aug 14, 2024
53b91ed
Issues for each conflict
stalgiag Aug 14, 2024
7ad0b04
'Raise Issue' link button
stalgiag Aug 15, 2024
0e8ac6d
Styling for Conflicts
stalgiag Aug 15, 2024
45a880b
Decompose assertion conflicts table
stalgiag Aug 15, 2024
c6b8619
Decompose UnexpectedBheaviorsConflictsTable and ConflictsIssueDetails
stalgiag Aug 15, 2024
221522e
Update snapshots and add new snapshot page
stalgiag Aug 15, 2024
9920e48
Merge branch 'development' into enhanced-conflict-review
stalgiag Aug 15, 2024
8b50444
Use dates object for date strings
stalgiag Aug 16, 2024
260c563
Small style changes
stalgiag Aug 16, 2024
5450dc7
Updated snapshots after style changes
stalgiag Aug 16, 2024
5782798
Update conflict color
stalgiag Aug 20, 2024
c345507
Remove unnecessary text for 0 conflicts
stalgiag Aug 20, 2024
0369fa0
Required roles for viewing conflicts
stalgiag Aug 20, 2024
987a08d
Resolve proptype error
stalgiag Aug 20, 2024
4cdc269
Remove conflict cell background color
stalgiag Aug 20, 2024
0d029ce
title and versionString in Conflicts h1
stalgiag Aug 20, 2024
a4bb6d1
Updates snapshots
stalgiag Aug 20, 2024
97d893a
Update tests, mark id as not required in UserPropType
stalgiag Aug 20, 2024
4eded57
Enhanced conflict review [extended] (#1197)
howard-e Aug 26, 2024
ff56408
Requested updates, table for outputs, merged per test separated by co…
stalgiag Sep 6, 2024
acc847c
Working raise issue links in Enhanced Conflict Review disclosures
stalgiag Sep 6, 2024
0117836
Issues detail for test specific disclosure
stalgiag Sep 6, 2024
36e876d
Update snapshot
stalgiag Sep 6, 2024
a7a0148
Merge branch 'development' into enhanced-conflict-review
stalgiag Sep 6, 2024
9dc77ec
Add additional headings to Conflict disclosures
stalgiag Sep 12, 2024
b238fe2
Update client/components/TestQueue/Conflicts/AssertionConflictsTable.jsx
stalgiag Sep 16, 2024
92f4476
Update client/components/TestQueue/Conflicts/UnexpectedBehaviorsConfl…
stalgiag Sep 16, 2024
8821be7
Update client/components/TestQueue/Conflicts/ConflictSummaryTable.jsx
stalgiag Sep 16, 2024
96ffc2d
Update client/utils/generateConflictMarkdown.js
stalgiag Sep 16, 2024
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
10 changes: 10 additions & 0 deletions client/components/TestQueue/Conflicts/AssertionConflictsTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,23 @@ import { UserPropType } from '../../common/proptypes';
import PropTypes from 'prop-types';

const AssertionConflictsTable = ({ conflictingResults, testers }) => {
const commandString = scenario => {
return `Assertions for 'After ${scenario.commands
.map(command => command.text)
.join(', then ')}'`;
stalgiag marked this conversation as resolved.
Show resolved Hide resolved
};

const allAssertions =
conflictingResults[0].scenarioResult.assertionResults.map(
ar => ar.assertion.text
);

return (
<>
<h3 style={{ marginBottom: '1rem' }}>
{commandString(conflictingResults[0].scenario)}
</h3>

<ConflictTable bordered responsive>
<thead>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion client/components/TestQueue/Conflicts/ConflictSummaryTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const ConflictTable = styled(ThemeTable)`

const ConflictSummaryTable = ({ conflictingResults }) => {
const commandString = scenario => {
return `After '${scenario.commands
return `Output for 'After ${scenario.commands
.map(command => command.text)
.join(', then ')}'`;
stalgiag marked this conversation as resolved.
Show resolved Hide resolved
};
Expand Down
10 changes: 10 additions & 0 deletions client/components/TestQueue/Conflicts/UnexpectedBehaviorsConflictsTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ import { ConflictTable } from './ConflictSummaryTable';
import { UserPropType } from '../../common/proptypes';

const UnexpectedBehaviorsConflictsTable = ({ conflictingResults, testers }) => {
const commandString = scenario => {
return `Unexpected Behaviors for 'After ${scenario.commands
.map(command => command.text)
.join(', then ')}'`;
stalgiag marked this conversation as resolved.
Show resolved Hide resolved
};

const allUnexpectedBehaviors = useMemo(
() =>
Array.from(
Expand All @@ -18,6 +24,10 @@ const UnexpectedBehaviorsConflictsTable = ({ conflictingResults, testers }) => {

return (
<>
<h3 style={{ marginBottom: '1rem' }}>
{commandString(conflictingResults[0].scenario)}
</h3>

<ConflictTable bordered responsive>
<thead>
<tr>
Expand Down
21 changes: 18 additions & 3 deletions client/tests/e2e/snapshots/saved/_test-queue_2_conflicts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ <h3>
aria-labelledby="disclosure-btn-undefined-Test 4: Navigate backwards to a collapsed select-only combobox in interaction mode"
class="css-19fsyrg">
<div>
<h3 style="margin-bottom: 1rem">After 'Shift+Tab'</h3>
<h3 style="margin-bottom: 1rem">
Output for 'After Shift+Tab'
</h3>
<div class="table-responsive">
<table class="css-1o41lau table table-bordered">
<thead>
Expand All @@ -164,6 +166,9 @@ <h3 style="margin-bottom: 1rem">After 'Shift+Tab'</h3>
</tbody>
</table>
</div>
<h3 style="margin-bottom: 1rem">
Assertions for 'After Shift+Tab'
</h3>
<div class="table-responsive">
<table class="css-1o41lau table table-bordered">
<thead>
Expand Down Expand Up @@ -310,7 +315,9 @@ <h3>
aria-labelledby="disclosure-btn-undefined-Test 6: Read information about a collapsed select-only combobox in interaction mode"
class="css-19fsyrg">
<div>
<h3 style="margin-bottom: 1rem">After 'Insert+Tab'</h3>
<h3 style="margin-bottom: 1rem">
Output for 'After Insert+Tab'
</h3>
<div class="table-responsive">
<table class="css-1o41lau table table-bordered">
<thead>
Expand All @@ -331,6 +338,9 @@ <h3 style="margin-bottom: 1rem">After 'Insert+Tab'</h3>
</tbody>
</table>
</div>
<h3 style="margin-bottom: 1rem">
Unexpected Behaviors for 'After Insert+Tab'
</h3>
<div class="table-responsive">
<table class="css-1o41lau table table-bordered">
<thead>
Expand Down Expand Up @@ -425,7 +435,9 @@ <h3>
aria-labelledby="disclosure-btn-undefined-Test 7: Open a collapsed select-only combobox in reading mode"
class="css-19fsyrg">
<div>
<h3 style="margin-bottom: 1rem">After 'Alt+Down'</h3>
<h3 style="margin-bottom: 1rem">
Output for 'After Alt+Down'
</h3>
<div class="table-responsive">
<table class="css-1o41lau table table-bordered">
<thead>
Expand All @@ -446,6 +458,9 @@ <h3 style="margin-bottom: 1rem">After 'Alt+Down'</h3>
</tbody>
</table>
</div>
<h3 style="margin-bottom: 1rem">
Unexpected Behaviors for 'After Alt+Down'
</h3>
<div class="table-responsive">
<table class="css-1o41lau table table-bordered">
<thead>
Expand Down
Loading