Merge pull request #15 from foretagsplatsen/release-3.1.1

Release 3.1.1
foretagsplatsen · Jul 5, 2022 · 5b57543 · 5b57543
2 parents 7fb583a + c550f0e
commit 5b57543
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/lib/helpers/expect-helpers.js b/lib/helpers/expect-helpers.js
@@ -34,7 +34,7 @@ function getInitialReceiver (node) {
   }
 }
 
-const expectRegexp = /^expect\([^)]*\)\.(not\.)?(?:to\.)?(.*)$/s
+const expectRegexp = /^expect\([^)]*\)\s*\.\s*(not\s*\.)?\s*(?:to\s*\.)?\s*(.*)$/s
 
 /**
  * Convert `expectNode`, a call to `expect()` with some chainers into

diff --git a/lib/rules/no-single-expect-in-then-or-should.js b/lib/rules/no-single-expect-in-then-or-should.js
@@ -34,8 +34,8 @@ module.exports = {
     //----------------------------------------------------------------------
 
     /**
-     * Use `fixer` to rewrite `node` (a call to `then()` or `should()`
-     * with a lonely `expect()` call as body).
+     * Use `fixer` to rewrite `thenOrShouldCallNode` (a call to
+     * `then()` or `should()` with a lonely `expect()` call as body).
      */
     function fixCall (fixer, thenOrShouldCallNode, expectNode) {
       // shouldString is, e.g., .should("equal", 2)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@finsit/eslint-plugin-cypress",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "An ESLint plugin for projects using Cypress",
   "main": "index.js",
   "author": "Chris Breiding (chris@cypress.io)",

diff --git a/tests/lib/rules/no-single-expect-in-then-or-should.js b/tests/lib/rules/no-single-expect-in-then-or-should.js
@@ -61,5 +61,10 @@ ruleTester.run('no-single-expect-in-then-or-should', rule, {
       errors: [thenError],
       output: 'cy.should("match", "checked")',
     },
+    {
+      code: 'cy.then(($a) => {expect($a) .to.have.attr("href")})',
+      errors: [thenError],
+      output: 'cy.should("have.attr", "href")',
+    },
   ],
 })
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ function getInitialReceiver (node) { @@
       }
     }
-    const expectRegexp = /^expect\([^)]*\)\.(not\.)?(?:to\.)?(.*)$/s
+    const expectRegexp = /^expect\([^)]*\)\s*\.\s*(not\s*\.)?\s*(?:to\s*\.)?\s*(.*)$/s
     /**
      * Convert `expectNode`, a call to `expect()` with some chainers into
@@ Expand Down @@