Merge pull request #26 from unexpectedjs/ssimonsen/testing-snapshot-o…

…n-shifted-subjects

Testing snapshot inspected snapshots

lib/ensureAfterHookIsRegistered.js

@@ -203,14 +203,20 @@ function ensureAfterBlockIsRegistered(topLevelFixes) {
             }
             const fixes = [];
             let stringifiedSubject;
-            let newAssertionName = 'to equal snapshot';
-            if (typeof subject === 'string') {
+            let newAssertionName = assertionName;
+            if (
+              typeof subject === 'string' &&
+              assertionName === 'to equal snapshot'
+            ) {
               stringifiedSubject = stringify(
                 subject,
                 indentationWidth,
                 expectForRendering
               ).replace(/\n^(?=[^\n])/gm, `\n${indent}`);
-            } else if (isSimpleObjectTree(subject, expectForRendering)) {
+            } else if (
+              isSimpleObjectTree(subject, expectForRendering) &&
+              assertionName === 'to equal snapshot'
+            ) {
               expectForRendering.output.indentationWidth = indentationWidth;
               stringifiedSubject = expectForRendering
                 .inspect(subject)
@@ -227,7 +233,7 @@ function ensureAfterBlockIsRegistered(topLevelFixes) {
               if (newAssertionName !== assertionName) {
                 fixes.unshift(
                   ruleFixer.replaceText(
-                    node.arguments[1],
+                    node.arguments[node.arguments.length - 1],
                     `'${newAssertionName}', ${stringifiedSubject}`
                   )
                 );
@@ -243,7 +249,7 @@ function ensureAfterBlockIsRegistered(topLevelFixes) {
               if (newAssertionName !== assertionName) {
                 fixes.unshift(
                   ruleFixer.replaceText(
-                    node.arguments[1],
+                    node.arguments[node.arguments.length - 1],
                     `'${newAssertionName}'`
                   )
                 );

lib/unexpected-snapshot.js

@@ -112,13 +112,18 @@ module.exports = {
         '<any> to inspect as snapshot <string?>'
       ],
       (expect, subject, ...args) => {
+        let subjectForAssertion;
         if (expect.testDescription === 'to inspect as snapshot') {
-          subject = expectForRendering.inspect(subject).toString('text');
+          subjectForAssertion = expectForRendering
+            .inspect(subject)
+            .toString('text');
+        } else {
+          subjectForAssertion = subject;
         }
         if (args.length === 1) {
           return expect.withError(
             () => {
-              expect(subject, 'to equal', args[0]);
+              expect(subjectForAssertion, 'to equal', args[0]);
             },
             err => {
               if (isNode) {

test/unexpected-snapshot.js

@@ -123,6 +123,74 @@ expect.addAssertion(
   }
 );
 
+describe('inspect as snapshot', () => {
+  it('should fill in a missing snapshot', function() {
+    return expect(
+      () => {
+        it('should foo', function() {
+          expect(['a', 'b', 'c'], 'to inspect as snapshot');
+        });
+      },
+      'to come out as',
+      () => {
+        it('should foo', function() {
+          expect(
+            ['a', 'b', 'c'],
+            'to inspect as snapshot',
+            "[ 'a', 'b', 'c' ]"
+          );
+        });
+      }
+    );
+  });
+
+  it('should update incorrect snapshots', function() {
+    return expect(
+      () => {
+        it('should foo', function() {
+          expect(['a', 'b', 'c'], 'to inspect as snapshot', "['a', 'b', 'c']");
+        });
+      },
+      'to come out as',
+      () => {
+        it('should foo', function() {
+          expect(
+            ['a', 'b', 'c'],
+            'to inspect as snapshot',
+            "[ 'a', 'b', 'c' ]"
+          );
+        });
+      }
+    );
+  });
+
+  it('supports inspected snapshots on shifted subjects', () => {
+    return expect(
+      () => {
+        it('should foo', function() {
+          expect(
+            ['c', 'a', 'b'],
+            'when sorted',
+            'to inspect as snapshot',
+            "['a', 'b', 'c']"
+          );
+        });
+      },
+      'to come out as',
+      () => {
+        it('should foo', function() {
+          expect(
+            ['c', 'a', 'b'],
+            'when sorted',
+            'to inspect as snapshot',
+            "[ 'a', 'b', 'c' ]"
+          );
+        });
+      }
+    );
+  });
+});
+
 describe('to equal snapshot', function() {
   it('should fill in a missing single line string', function() {
     return expect(
@@ -458,6 +526,29 @@ it('should foo', function() {
     );
   });
 
+  it('supports matching snapshots on shifted subjects', () => {
+    return expect(
+      () => {
+        it('should foo', function() {
+          expect(['c', 'a', 'b'], 'when sorted', 'to equal snapshot', [
+            'a',
+            'b'
+          ]);
+        });
+      },
+      'to come out as',
+      () => {
+        it('should foo', function() {
+          expect(['c', 'a', 'b'], 'when sorted', 'to equal snapshot', [
+            'a',
+            'b',
+            'c'
+          ]);
+        });
+      }
+    );
+  });
+
   describe.skip('with expect.it', function() {
     it('should fill in a missing string', function() {
       return expect(