Merge branch 'feat/support_wds5' of github.com:cypress-io/cypress int…

…o feat/support_wds5

cli/CHANGELOG.md

@@ -14,6 +14,7 @@ _Released 4/16/2024 (PENDING)_
 
 **Bugfixes:**
 
+- Fixed an issue where asserts with custom messages weren't displaying properly. Fixes [#29167](https://github.com/cypress-io/cypress/issues/29167)
 - Fixed and issue where cypress launch arguments were not being escaped correctly with multiple values inside quotes. Fixes [#27454](https://github.com/cypress-io/cypress/issues/27454).
 
 

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

@@ -85,6 +85,13 @@ describe('formattedMessage', () => {
 
       expect(result).to.equal('expected <strong>&lt;button#increment&gt;</strong> to be enabled')
     })
+
+    it('renders the custom message properly with the assertion message', () => {
+      const specialMessage = 'My Custom Message: expected **abcdef** to equal **abcdef**'
+      const result = formattedMessage(specialMessage, 'assert')
+
+      expect(result).to.equal('My Custom Message: expected <strong>abcdef</strong> to equal <strong>abcdef</strong>')
+    })
   })
 
   describe('when command that accepts url', () => {

packages/reporter/src/commands/command.tsx

@@ -35,15 +35,15 @@ 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)**`
-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)
 // and cy.log and Cypress.log supports markdown formatting
 export const formattedMessage = (message: string, name?: string) => {
   if (!message) return ''
 
-  // the command message is formatted as 'expected <actual> to {assertion} <expected>'
+  // the command message is formatted as '(Optional Custom Msg:) expected <actual> to {assertion} <expected>'
   const assertionArray = message.match(assertionRegex)
 
   const expectedActualArray = () => {