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

fix(ui): display duplicate aliases in command log #16382

Merged
merged 2 commits into from
May 7, 2021
Merged

fix(ui): display duplicate aliases in command log #16382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f8df43
ui: display duplicate aliases in command log
flotwig May 6, 2021
3ee632e
CSS updates for duplicate aliases
jennifer-shehane May 7, 2021
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
6 changes: 4 additions & 2 deletions packages/reporter/cypress/fixtures/runnables_commands.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@
"event": true,
"testId": "r3",
"timeout": 4000,
"type": "parent"
"type": "parent",
"alias": "dup0"
},
{
"hookId": "r3",
Expand All @@ -126,7 +127,8 @@
"event": true,
"testId": "r3",
"timeout": 4000,
"type": "parent"
"type": "parent",
"alias": "dup1"
},
{
"hookId": "r3",
Expand Down
14 changes: 14 additions & 0 deletions packages/reporter/cypress/integration/commands_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,27 @@ describe('commands', () => {
.should('have.text', '4')
})

it('displays names of duplicates', () => {
cy.contains('GET --- /dup').closest('.command').find('.command-alias')
.should('have.text', 'dup0, dup1')
})

it('expands all events after clicking arrow', () => {
cy.contains('GET --- /dup').closest('.command').find('.command-expander').click()
cy.get('.command-name-xhr').should('have.length', 6)
cy.contains('GET --- /dup').closest('.command').find('.duplicates')
.should('be.visible')
.find('.command').should('have.length', 3)
})

it('splits up duplicate names when expanded', () => {
cy.contains('GET --- /dup').closest('.command').as('cmd')

cy.get('@cmd').find('.command-expander').click()
cy.get('@cmd').find('.command-alias').as('alias')
cy.get('@alias').its(0).should('have.text', 'dup0')
cy.get('@alias').its(1).should('have.text', 'dup1')
})
})

context('clicking', () => {
Expand Down
29 changes: 19 additions & 10 deletions packages/reporter/src/commands/command.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,31 @@ const AliasesReferences = observer(({ model, aliasesWithDuplicates }: AliasesRef
))

interface AliasesProps {
isOpen: boolean
model: CommandModel
aliasesWithDuplicates: Array<Alias> | null
}

const Aliases = observer(({ model, aliasesWithDuplicates }: AliasesProps) => {
const Aliases = observer(({ model, aliasesWithDuplicates, isOpen }: AliasesProps) => {
if (!model.alias) return null

return (
<span>
{_.map(([] as Array<Alias>).concat(model.alias), (alias) => (
<Tooltip key={alias} placement='top' title={`${model.displayMessage} aliased as: '${alias}'`} className='cy-tooltip'>
<span className={cs('command-alias', `${model.aliasType}`, { 'show-count': shouldShowCount(aliasesWithDuplicates, alias, model) })}>
{alias}
</span>
</Tooltip>
))}
{_.map(([] as Array<Alias>).concat(model.alias), (alias) => {
const aliases = [alias]

if (!isOpen && model.hasDuplicates) {
aliases.push(..._.compact(model.duplicates.map((dupe) => dupe.alias)))
}

return (
<Tooltip key={alias} placement='top' title={`${model.displayMessage} aliased as: ${aliases.map((alias) => `'${alias}'`).join(', ')}`} className='cy-tooltip'>
<span className={cs('command-alias', `${model.aliasType}`, { 'show-count': shouldShowCount(aliasesWithDuplicates, alias, model) })}>
{aliases.join(', ')}
</span>
</Tooltip>
)
})}
</span>
)
})
Expand Down Expand Up @@ -213,9 +222,9 @@ class Command extends Component<Props> {
<span className='num-elements'>{model.numElements}</span>
</Tooltip>
<span className='alias-container'>
<Aliases model={model} aliasesWithDuplicates={aliasesWithDuplicates} />
<Aliases model={model} aliasesWithDuplicates={aliasesWithDuplicates} isOpen={this.isOpen} />
<Tooltip placement='top' title={`This event occurred ${model.numDuplicates} times`} className='cy-tooltip'>
<span className={cs('num-duplicates', { 'has-alias': model.alias })}>{model.numDuplicates}</span>
<span className={cs('num-duplicates', { 'has-alias': model.alias, 'has-duplicates': model.numDuplicates > 1 })}>{model.numDuplicates}</span>
</Tooltip>
</span>
</span>
Expand Down
17 changes: 12 additions & 5 deletions packages/reporter/src/commands/commands.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@
padding: 0 5px;
display: inline-block;

&.show-count {
padding-right: 2px;
}

&.route {
background-color: $yellow-medium;
}
Expand All @@ -122,7 +118,13 @@
}

&.show-count {
padding-right: 2px;
border-radius: 10px 0 0 10px;
max-width: 200px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
}
}

Expand All @@ -148,10 +150,15 @@

.num-duplicates.has-alias {
border-radius: 10px;
line-height: 2;
line-height: 1;
padding: 3px 5px 3px 5px;
}

.num-duplicates.has-alias.has-duplicates {
border-radius: 0 10px 10px 0;
padding: 4px 5px 2px 3px;
}

.command-alias-count {
border-radius: 0 10px 10px 0;
padding: 5px 6px 3px 4px;
Expand Down