Skip to content

Commit 3b61635

Browse files
committed
Merge remote-tracking branch 'origin/develop' into mabel/issue-12026-handle-snapshots-in-studio
2 parents fe5e574 + 5f756c4 commit 3b61635

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

cli/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
22
## 15.5.0
33

4-
_Released 10/21/2025 (PENDING)_
4+
_Released 10/17/2025_
55

66
**Features:**
77

@@ -16,6 +16,7 @@ _Released 10/21/2025 (PENDING)_
1616
**Misc:**
1717

1818
- Browser detection in Cypress now always prefers 64-bit browser installs to 32-bit browser installs. Addressed in [#32656](https://github.com/cypress-io/cypress/pull/32656).
19+
- Update code button styles and rename Get Code for Code on cy.prompt. Addressed in [#32745](https://github.com/cypress-io/cypress/pull/32745).
1920
- Disable pinning commands within Studio mode. Addresses [#1206](https://github.com/cypress-io/cypress-services/issues/12026). Addressed in [#32753](https://github.com/cypress-io/cypress/pull/32753).
2021
- Update the message about snapshots not being available within Studio mode. Addresses [#31273](https://github.com/cypress-io/cypress/issues/31273). Addressed in [#32753](https://github.com/cypress-io/cypress/pull/32753).
2122

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cypress",
3-
"version": "15.4.0",
3+
"version": "15.5.0",
44
"description": "Cypress is a next generation front end testing tool built for the modern web",
55
"private": true,
66
"scripts": {

packages/reporter/src/commands/command.cy.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ describe('commands', () => {
145145
</div>,
146146
)
147147

148-
cy.get('.command-prompt-get-code').should('be.visible').should('have.text', 'Get code')
148+
cy.get('.command-prompt-get-code').should('be.visible').should('have.text', 'Code')
149149
cy.get('.command-prompt-get-code-indicator').should('be.visible')
150150

151151
cy.percySnapshot()
@@ -173,7 +173,7 @@ describe('commands', () => {
173173
</div>,
174174
)
175175

176-
cy.get('.command-prompt-get-code').should('be.visible').should('have.text', 'Get code')
176+
cy.get('.command-prompt-get-code').should('be.visible').should('have.text', 'Code')
177177
cy.get('.command-prompt-get-code-indicator').should('be.visible')
178178

179179
cy.percySnapshot()

packages/reporter/src/commands/command.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ const Command: React.FC<CommandProps> = observer(({ model, aliasesWithDuplicates
495495
return null
496496
}
497497

498-
let commandContent = (<div className='command-wrapper-container'>
498+
const commandContent = (<div className='command-wrapper-container'>
499499
<div
500500
className={cs('command-wrapper-text', {
501501
'command-wrapper-text-group': model.hasChildren && groupId,
@@ -532,7 +532,7 @@ const Command: React.FC<CommandProps> = observer(({ model, aliasesWithDuplicates
532532
size='16'
533533
strokeColor='white'
534534
/>
535-
<span>Get code</span>
535+
<span>Code</span>
536536
</Button>
537537
)}
538538
</div>)
@@ -560,8 +560,8 @@ const Command: React.FC<CommandProps> = observer(({ model, aliasesWithDuplicates
560560
wrapperClassName={cs('command-pin-target', { 'command-group': !!groupId, 'command-group-no-children': !model.hasChildren && model.group })}
561561
>
562562
{commandContent}
563-
</FlashOnClick>}
564-
563+
</FlashOnClick>
564+
}
565565
</div>
566566
<Progress model={model} />
567567
{model.hasChildren && model.isOpen && (

packages/reporter/src/commands/commands.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@
104104

105105
.command-prompt-get-code {
106106
cursor: pointer;
107-
font-family: $font-system;
107+
font-family: $font-system;
108+
font-size: 12px;
108109
}
109110
}
110111
}

0 commit comments

Comments
 (0)