More chai/sinon patches

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 
 defaults: &defaults
   docker:
-    - image: cimg/node:18.2.0
+    - image: cimg/node:18.4.0
 
 _steps:
   save_npm_cache: &save_npm_cache

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-codemods",
-  "version": "0.26.1",
+  "version": "0.26.3",
   "description": "Codemods for migrating test files to Jest",
   "license": "MIT",
   "repository": "skovhus/jest-codemods",
@@ -26,7 +26,7 @@
     "test:cov": "yarn test --coverage",
     "test:watch": "yarn test --watch",
     "test": "jest --runInBand",
-    "verify": "yarn lint && yarn build && yarn test:cov",
+    "verify": "yarn lint && yarn build && ./bin/jest-codemods.js --version && yarn test:cov",
     "verify:bail": "yarn lint:bail && yarn verify",
     "ci": "yarn verify:bail && codecov",
     "prepare": "husky install"
@@ -53,35 +53,35 @@
     "codemods"
   ],
   "dependencies": {
-    "@babel/core": "7.18.0",
-    "@babel/preset-env": "7.18.0",
+    "@babel/core": "7.18.6",
+    "@babel/preset-env": "7.18.6",
     "chalk": "4.1.2",
-    "execa": "6.1.0",
-    "globby": "13.1.1",
+    "execa": "4.1.0",
+    "globby": "11.1.0",
     "inquirer": "8.2.4",
     "is-git-clean": "1.1.0",
     "jscodeshift": "0.13.1",
     "meow": "7.1.1",
     "update-notifier": "5.1.0"
   },
   "devDependencies": {
-    "@types/jest": "27.5.1",
+    "@types/jest": "28.1.3",
     "@types/jscodeshift": "0.11.5",
     "@types/update-notifier": "5.1.0",
-    "@typescript-eslint/eslint-plugin": "5.23.0",
-    "@typescript-eslint/parser": "5.23.0",
+    "@typescript-eslint/eslint-plugin": "5.30.0",
+    "@typescript-eslint/parser": "5.30.0",
     "codecov": "3.8.3",
-    "eslint": "8.16.0",
+    "eslint": "8.18.0",
     "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-jest": "26.4.2",
-    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-jest": "26.5.3",
+    "eslint-plugin-prettier": "4.1.0",
     "eslint-plugin-simple-import-sort": "7.0.0",
     "husky": "8.0.1",
-    "jest": "28.1.0",
-    "lint-staged": "12.4.1",
-    "prettier": "2.6.2",
-    "ts-jest": "28.0.2",
-    "typescript": "4.6.4"
+    "jest": "28.1.2",
+    "lint-staged": "13.0.3",
+    "prettier": "2.7.1",
+    "ts-jest": "28.0.5",
+    "typescript": "4.7.4"
   },
   "jest": {
     "preset": "ts-jest",

release.sh

@@ -15,3 +15,7 @@ fi
 echo "Deploying version $version."
 
 yarn publish
+
+tag=$version
+git tag -a "${tag}" -m "Release ${tag}"
+git push origin "${tag}"

renovate.json

@@ -1,5 +1,9 @@
 {
-  "extends": [
-    "config:base"
+  "extends": ["config:base"],
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
+      "automerge": true
+    }
   ]
 }

src/cli/index.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import chalk from 'chalk'
-import { globbySync } from 'globby'
+import globby from 'globby'
 import inquirer from 'inquirer'
 import meow from 'meow'
 import updateNotifier from 'update-notifier'
@@ -157,7 +157,7 @@ function supportFailure(supportedItems) {
 
 function expandFilePathsIfNeeded(filesBeforeExpansion) {
   const shouldExpandFiles = filesBeforeExpansion.some((file) => file.includes('*'))
-  return shouldExpandFiles ? globbySync(filesBeforeExpansion) : filesBeforeExpansion
+  return shouldExpandFiles ? globby.sync(filesBeforeExpansion) : filesBeforeExpansion
 }
 
 inquirer

src/cli/transformers.test.ts

@@ -3,7 +3,7 @@
 
 let execaReturnValue
 jest.setMock('execa', {
-  execaSync: () => execaReturnValue,
+  sync: () => execaReturnValue,
 })
 
 import fs from 'fs'

src/cli/transformers.ts

@@ -1,4 +1,4 @@
-import { execaSync } from 'execa'
+import execa from 'execa'
 import path from 'path'
 
 export const transformerDirectory = path.join(__dirname, '../', 'transformers')
@@ -50,7 +50,7 @@ function executeTransformation({
 
   console.log(`Executing command: jscodeshift ${args.join(' ')}`)
 
-  const result = execaSync('node', [jscodeshiftExecutable, ...args], {
+  const result = execa.sync('node', [jscodeshiftExecutable, ...args], {
     stdio: 'inherit',
     stripFinalNewline: false,
   })

src/transformers/chai-should.test.ts

@@ -25,7 +25,7 @@ test('chai-enzyme: handle .to.contain(JSXElement)', () => {
     expect(wrapper).to.contain(<ImpressionLogger />)
   `,
     `
-    expect(wrapper.contains(<ImpressionLogger />)).toEqual(true)
+    expect(wrapper).containsMatchingElement(<ImpressionLogger />)
   `
   )
 })
@@ -120,8 +120,8 @@ test('removes imports and does basic conversions of should and expect', () => {
     `
         describe('Instantiating TextField', () => {
             it('should set the placeholder correctly', () => {
-                expect(textField.props.placeholder).toEqual(PLACEHOLDER);
-                expect(textField.props.placeholder).not.toEqual(PLACEHOLDER);
+                expect(textField.props.placeholder).toBe(PLACEHOLDER);
+                expect(textField.props.placeholder).not.toBe(PLACEHOLDER);
             });
         });
     `
@@ -156,13 +156,13 @@ test('removes imports and does basic conversions of should and expect (2)', () =
     `
         describe('Instantiating TextField', () => {
             it('should set the placeholder correctly', () => {
-                expect(textField.props.placeholder).toEqual(PLACEHOLDER);
-                expect(textField.props.placeholder).not.toEqual(PLACEHOLDER);
+                expect(textField.props.placeholder).toBe(PLACEHOLDER);
+                expect(textField.props.placeholder).not.toBe(PLACEHOLDER);
             });
 
             it('should inherit id prop', () => {
-                expect(dropdown.props.id).toEqual(STANDARD_PROPS.id);
-                expect(dropdown.props.id).not.toEqual(STANDARD_PROPS.id);
+                expect(dropdown.props.id).toBe(STANDARD_PROPS.id);
+                expect(dropdown.props.id).not.toBe(STANDARD_PROPS.id);
             });
 
             it('should map open prop to visible prop', () => {
@@ -190,8 +190,8 @@ test('removes imports (case where should is not assigned)', () => {
     `
         describe('Instantiating TextField', () => {
           it('should set the placeholder correctly', () => {
-              expect(textField.props.placeholder).toEqual(PLACEHOLDER);
-              expect(textField.props.placeholder).not.toEqual(PLACEHOLDER);
+              expect(textField.props.placeholder).toBe(PLACEHOLDER);
+              expect(textField.props.placeholder).not.toBe(PLACEHOLDER);
           });
         });`
   )
@@ -456,22 +456,28 @@ test('converts "equal"', () => {
         expect(42).to.equal(42);
         expect(1).to.not.equal(true);
         expect({ foo: 'bar' }).to.not.equal({ foo: 'bar' });
+
         expect({ foo: 'bar' }).to.deep.equal({ foo: 'bar' });
+        expect({ foo: 'bar' }).not.to.deep.equal({ foo: 'bar' });
+        expect({ foo: 'bar' }).to.not.deep.equal({ foo: 'bar' });
 
         should.equal('foo', 'foo');
         should.not.equal('foo', 'bar');
     `,
     `
-        expect('hello').toEqual('hello');
+        expect('hello').toBe('hello');
         // some message here explaining hello
-        expect('hello').toEqual('hello');
-        expect(42).toEqual(42);
-        expect(1).not.toEqual(true);
-        expect({ foo: 'bar' }).not.toEqual({ foo: 'bar' });
+        expect('hello').toBe('hello');
+        expect(42).toBe(42);
+        expect(1).not.toBe(true);
+        expect({ foo: 'bar' }).not.toBe({ foo: 'bar' });
+
         expect({ foo: 'bar' }).toEqual({ foo: 'bar' });
+        expect({ foo: 'bar' }).not.toEqual({ foo: 'bar' });
+        expect({ foo: 'bar' }).not.toEqual({ foo: 'bar' });
 
-        expect('foo').toEqual('foo');
-        expect('foo').not.toEqual('bar');
+        expect('foo').toBe('foo');
+        expect('foo').not.toBe('bar');
     `
   )
 })
@@ -633,6 +639,17 @@ test('converts chained "includes-contains"', () => {
   )
 })
 
+test('chai-enzyme: handle .text() with .contains()', () => {
+  expectTransformation(
+    `
+      expect(wrapper.text()).to.contain(priceString);
+    `,
+    `
+      expect(wrapper.text()).toContain(priceString);
+    `
+  )
+})
+
 test('converts empty array assertion', () => {
   expectTransformation(
     `
@@ -1030,11 +1047,11 @@ test('removes params to expect() except for the first', () => {
         // Expected foo to be defined
         expect(foo).toBeDefined();
         // Expected foo to be defined
-        expect(foo).toEqual(true);
+        expect(foo).toBe(true);
         // Expected foo to be defined for \${id}
         expect(foo).toBeDefined();
         // 'Expected ' + foo + ' to be defined'
-        expect(foo).toEqual(true);
+        expect(foo).toBe(true);
     `
   )
 })
@@ -1118,6 +1135,47 @@ test('converts equalto(null) to toBeNull()', () => {
   )
 })
 
+test('converts subtly different equality operators', () => {
+  expectTransformation(
+    `
+        // Strict equality (===)
+        expect(2 + 2).to.eq(5);
+        expect(2 + 2).to.equal(5);
+        expect(2 + 2).to.equals(5);
+        expect(2 + 2).to.not.equals(5);
+        expect(2 + 2).not.to.equals(5);
+
+        // Strict equality (===) + deep = deep equality
+        expect(2 + 2).to.deep.eq(5);
+
+        // Deep equality
+        expect(2 + 2).to.eql(5);
+        expect(2 + 2).to.eqls(5);
+        expect(2 + 2).to.not.eqls(5);
+        expect(2 + 2).not.to.eqls(5);
+        expect(2 + 2).to.deep.eql(5);
+    `,
+    `
+        // Strict equality (===)
+        expect(2 + 2).toBe(5);
+        expect(2 + 2).toBe(5);
+        expect(2 + 2).toBe(5);
+        expect(2 + 2).not.toBe(5);
+        expect(2 + 2).not.toBe(5);
+
+        // Strict equality (===) + deep = deep equality
+        expect(2 + 2).toEqual(5);
+
+        // Deep equality
+        expect(2 + 2).toEqual(5);
+        expect(2 + 2).toEqual(5);
+        expect(2 + 2).not.toEqual(5);
+        expect(2 + 2).not.toEqual(5);
+        expect(2 + 2).toEqual(5);
+    `
+  )
+})
+
 test('converts "within"', () => {
   expectTransformation(
     `
@@ -1219,9 +1277,10 @@ it('leaves code without should/expect', () => {
   expect(result).toBeNull()
 })
 
-it('converts before, after and context to beforeAll, afterAll and describe', () => {
-  expectTransformation(
-    `
+describe('converts before, after and context to beforeAll, afterAll and describe', () => {
+  it('converts cases correctly', () => {
+    expectTransformation(
+      `
         before(() => {
           doSetup();
         });
@@ -1238,7 +1297,7 @@ it('converts before, after and context to beforeAll, afterAll and describe', ()
           });
         });
     `,
-    `
+      `
         beforeAll(() => {
           doSetup();
         });
@@ -1255,7 +1314,25 @@ it('converts before, after and context to beforeAll, afterAll and describe', ()
           });
         });
     `
-  )
+    )
+  })
+
+  it('skips call expression spreads with the same identifier', () => {
+    expectTransformation(
+      `
+      const foo = {
+        a: 'aa',
+        ...context(searchParams),
+      }
+    `,
+      `
+      const foo = {
+        a: 'aa',
+        ...context(searchParams),
+      }
+    `
+    )
+  })
 })
 
 test('supports chai-arrays plugin', () => {