Fix issue where command is never fully ended and following assertions are displayed incorrectly

packages/driver/cypress/integration/cypress/cy_spec.js

@@ -17,6 +17,27 @@ describe('driver/src/cypress/cy', () => {
     $(doc.body).empty().html(body)
   })
 
+  // https://github.com/cypress-io/cypress/issues/7731
+  // NOTE: this must remain the first test in the file
+  // or it will not properly check for the described issue
+  context('closing commands', () => {
+    beforeEach(function () {
+      this.logs = []
+
+      cy.on('log:added', (attrs, log) => {
+        this.logs.push(log)
+      })
+
+      return null
+    })
+
+    it('properly closes commands', function () {
+      expect(true).to.be.true
+      expect(this.logs.length).to.be.equal(1)
+      expect(this.logs[0].toJSON()).to.have.property('type', 'parent')
+    })
+  })
+
   context('hard deprecated private props', () => {
     it('throws on accessing props', () => {
       const fn = () => {

packages/driver/src/cypress/cy.js

@@ -459,6 +459,10 @@ const create = function (specWindow, Cypress, Cookies, state, config, log) {
       // also reset recentlyReady back to null
       state('recentlyReady', null)
 
+      // we're finished with the current command
+      // so set it back to null
+      state('current', null)
+
       state('subject', subject)
 
       return subject