@tryghost/jest-snapshot 0.3.12 → 0.4.0

package/lib/jest-snapshot.js

@@ -1,4 +1,4 @@
-const expect = require('expect');
+const {jestExpect} = require('@jest/expect');
 const SnapshotManager = require('./snapshot-manager');
 const snapshotManager = new SnapshotManager();
 
@@ -25,7 +25,7 @@ const mochaHooks = {
     }
 };
 
-const {any, anything, stringMatching} = expect;
+const {any, anything, stringMatching} = jestExpect;
 
 module.exports = {
     mochaHooks,

package/lib/snapshot-manager.js

@@ -1,10 +1,11 @@
 const {SnapshotState, toMatchSnapshot} = require('jest-snapshot');
 const errors = require('@tryghost/errors');
-const expect = require('expect');
-const utils = require('expect/build/utils');
+const utils = require('@jest/expect-utils');
+const assert = require('assert');
 const path = require('path');
+const {makeMessageFromMatchMessage} = require('./utils');
 
-class SnapshotManageer {
+class SnapshotManager {
     constructor() {
         this.registry = {};
         this.currentTest = {};
@@ -65,33 +66,56 @@ class SnapshotManageer {
     }
 
     getSnapshotState(testFile, willUpdate) {
-        // Intilize the SnapshotState, it’s responsible for actually matching
+        // Initialize the SnapshotState, it’s responsible for actually matching
         // actual snapshot with expected one and storing results
         return new SnapshotState(testFile, {
             updateSnapshot: willUpdate
         });
     }
 
+    assertSnapshot(response, assertion) {
+        const {properties, field, error} = assertion;
+
+        if (!response[field]) {
+            error.message = `Unable to match snapshot on undefined field ${field} ${error.contextString}`;
+            error.expected = field;
+            error.actual = 'undefined';
+            assert.notEqual(response[field], undefined, error);
+        }
+
+        const hint = `[${field}]`;
+        const match = this.match(response[field], properties, hint);
+
+        Object.keys(properties).forEach((prop) => {
+            const errorMessage = `"response.${field}" is missing the expected property "${prop}"`;
+            error.message = makeMessageFromMatchMessage(match.message(), errorMessage);
+            error.expected = prop;
+            error.actual = 'undefined';
+            error.showDiff = false; // Disable mocha's diff output as it's already present in match.message()
+
+            assert.notEqual(response[field][prop], undefined, error);
+        });
+
+        if (match.pass !== true) {
+            const errorMessage = `"response.${field}" does not match snapshot.`;
+            error.message = makeMessageFromMatchMessage(match.message(), errorMessage);
+            error.expected = match.expected;
+            error.actual = match.actual;
+            error.showDiff = false; // Disable mocha's diff output as it's already present in match.message()
+        }
+
+        assert.equal(match.pass, true, error);
+    }
+
     match(received, properties = {}, hint) {
         const {testFile, snapshotName, willUpdate} = this._getConfig();
 
         const snapshotState = this.getSnapshotState(testFile, willUpdate);
-        // Equals is not exposed from the internals of expect
-        // This truly bananananas workaround comes from here: https://github.com/facebook/jest/issues/11867
-        let equals = null;
-        expect.extend({
-            __capture_equals__() {
-                equals = this.equals;
-                return {pass: true};
-            }
-        });
-        expect().__capture_equals__();
-
         const matcher = toMatchSnapshot.bind({
             snapshotState,
             currentTestName: snapshotName,
             utils,
-            equals
+            equals: utils.equals
         });
 
         // Execute the matcher
@@ -104,4 +128,4 @@ class SnapshotManageer {
     }
 }
 
-module.exports = SnapshotManageer;
+module.exports = SnapshotManager;

package/lib/utils.js

@@ -0,0 +1,11 @@
+/**
+ *
+ * @param {String} message
+ * @param {String} errorMessage
+ * @returns {String}
+ */
+module.exports.makeMessageFromMatchMessage = function makeMessageFromMatchMessage(message, errorMessage) {
+    const messageLines = message.split('\n');
+    messageLines.splice(0, 1, errorMessage);
+    return messageLines.join('\n');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/jest-snapshot",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "repository": "https://github.com/TryGhost/framework/tree/main/packages/jest-snapshot",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -19,15 +19,16 @@
     "access": "public"
   },
   "devDependencies": {
-    "c8": "7.11.0",
-    "mocha": "9.2.2",
+    "c8": "7.11.3",
+    "mocha": "10.0.0",
     "should": "13.2.3",
-    "sinon": "13.0.2"
+    "sinon": "14.0.0"
   },
   "dependencies": {
-    "@tryghost/errors": "^1.2.11",
-    "expect": "^27.5.0",
-    "jest-snapshot": "^27.5.0"
+    "@jest/expect": "^28.0.1",
+    "@jest/expect-utils": "^28.0.1",
+    "@tryghost/errors": "^1.2.13",
+    "jest-snapshot": "^28.0.0"
   },
-  "gitHead": "6a49350821ab2dd54d4b8a1ac7cde27b72aeaca0"
+  "gitHead": "0af921ce800c79f89685307914bd6d704302c043"
 }