fix: Add optional regex check for comma preceding 'but' in assertions for command formatting

cli/CHANGELOG.md

@@ -6,6 +6,7 @@ _Released 5/21/2024 (PENDING)_
 **Bugfixes:**
 
 - Fixed an issue where Cypress was unable to search in the Specs list for files or folders containing numbers. Fixes [#29034](https://github.com/cypress-io/cypress/issues/29034).
+- Fixed the display of some command assertions. Fixed in [#29517](https://github.com/cypress-io/cypress/pull/29517).
 
 **Dependency Updates:**
 

packages/reporter/cypress/e2e/unit/formatted_message.cy.ts

@@ -71,6 +71,13 @@ describe('formattedMessage', () => {
       expect(result).to.equal('expected <strong>span</strong> to have CSS property <strong>background-color</strong> with the value <strong>rgb(0, 0, 0)</strong>, but the value was <strong>rgba(0, 0, 0, 0)</strong>')
     })
 
+    it('bolds asterisks with "but" without comma', () => {
+      const specialMessage = 'expected **foo** to have length above **1** but got **0**'
+      const result = formattedMessage(specialMessage)
+
+      expect(result).to.equal('expected <strong>foo</strong> to have length above <strong>1</strong> but got <strong>0</strong>')
+    })
+
     it('bolds asterisks with simple assertions', () => {
       const specialMessage = 'expected **dom** to be visible'
       const result = formattedMessage(specialMessage, 'assert')

packages/reporter/src/commands/command.tsx

@@ -35,8 +35,9 @@ const asterisksRegex = /^\*\*(.+?)\*\*$/gs
 // 'expected **<span>** to exist in the DOM'
 // `expected **glob*glob** to contain *****`
 // `expected **<span>** to have CSS property **background-color** with the value **rgb(0, 0, 0)**, but the value was **rgba(0, 0, 0, 0)**`
+// `expected **foo** to have length above **1** but got **0**`
 // `Custom message expected **<span>** to exist in the DOM`
-const assertionRegex = /^.*?expected | to[^\*]+| not[^\*]+| with[^\*]+|, but[^\*]+/g
+const assertionRegex = /^.*?expected | to[^\*]+| not[^\*]+| with[^\*]+|,? but[^\*]+/g
 
 // used to format the display of command messages and error messages
 // we use markdown syntax within our error messages (code ticks, urls, etc)