Replace print with serialize in Immutable plugins (jestjs#4189)

* Replace print with serialize in Immutable plugins * Delete multiline string key to avoid conflict with 4183 * Update 3 snapshot tests * Replace printRecordProperties with getRecordIterator * Export 3 print functions from renamed immutable.js file * Move comment * Roll up immutable plugins * Replace getName with getImmutableName * Move Seq after all other types except Record * Delete newlines between adjacent import and sentinel lines
tushardhole · Aug 6, 2017 · 3ca7452 · 3ca7452
1 parent faf059d
commit 3ca7452
Show file tree

Hide file tree

Showing 17 changed files with 595 additions and 416 deletions.
diff --git a/packages/jest-matchers/src/__tests__/__snapshots__/spy_matchers.test.js.snap b/packages/jest-matchers/src/__tests__/__snapshots__/spy_matchers.test.js.snap
@@ -20,7 +20,7 @@ exports[`lastCalledWith works with Immutable.js objects 1`] = `
 "<dim>expect(<red>jest.fn()</><dim>).not.lastCalledWith(<green>expected</><dim>)
 
 Expected mock function to not have been last called with:
-  <green>[Immutable.Map {a: {\\"b\\": \\"c\\"}}, Immutable.Map {a: {\\"b\\": \\"c\\"}}]</>"
+  <green>[Immutable.Map {\\"a\\": {\\"b\\": \\"c\\"}}, Immutable.Map {\\"a\\": {\\"b\\": \\"c\\"}}]</>"
 `;
 
 exports[`lastCalledWith works with Map 1`] = `
@@ -239,7 +239,7 @@ exports[`toHaveBeenCalledWith works with Immutable.js objects 1`] = `
 "<dim>expect(<red>jest.fn()</><dim>).not.toHaveBeenCalledWith(<green>expected</><dim>)
 
 Expected mock function not to have been called with:
-  <green>[Immutable.Map {a: {\\"b\\": \\"c\\"}}, Immutable.Map {a: {\\"b\\": \\"c\\"}}]</>"
+  <green>[Immutable.Map {\\"a\\": {\\"b\\": \\"c\\"}}, Immutable.Map {\\"a\\": {\\"b\\": \\"c\\"}}]</>"
 `;
 
 exports[`toHaveBeenCalledWith works with Map 1`] = `
@@ -322,7 +322,7 @@ exports[`toHaveBeenLastCalledWith works with Immutable.js objects 1`] = `
 "<dim>expect(<red>jest.fn()</><dim>).not.toHaveBeenLastCalledWith(<green>expected</><dim>)
 
 Expected mock function to not have been last called with:
-  <green>[Immutable.Map {a: {\\"b\\": \\"c\\"}}, Immutable.Map {a: {\\"b\\": \\"c\\"}}]</>"
+  <green>[Immutable.Map {\\"a\\": {\\"b\\": \\"c\\"}}, Immutable.Map {\\"a\\": {\\"b\\": \\"c\\"}}]</>"
 `;
 
 exports[`toHaveBeenLastCalledWith works with Map 1`] = `

diff --git a/packages/jest-snapshot/src/__tests__/plugins.test.js b/packages/jest-snapshot/src/__tests__/plugins.test.js
@@ -29,7 +29,7 @@ const testPath = names => {
 it('gets plugins', () => {
   const {getSerializers} = require('../plugins');
   const plugins = getSerializers();
-  expect(plugins.length).toBe(10);
+  expect(plugins.length).toBe(4);
 });
 
 it('adds plugins from an empty array', () => testPath([]));

diff --git a/packages/pretty-format/src/__tests__/expect_util.js b/packages/pretty-format/src/__tests__/expect_util.js
@@ -10,21 +10,21 @@
 
 'use strict';
 
-import type {Plugins} from 'types/PrettyFormat';
+import type {OptionsReceived, Plugins} from 'types/PrettyFormat';
 
 const diff = require('jest-diff');
 const prettyFormat = require('../');
 
 module.exports = {
   getPrettyPrint: (plugins: Plugins) =>
-    function(received: any, expected: any, opts: any) {
+    function(received: any, expected: any, options?: OptionsReceived) {
       const prettyFormatted = prettyFormat(
         received,
         Object.assign(
-          {
+          ({
             plugins,
-          },
-          opts,
+          }: OptionsReceived),
+          options,
         ),
       );
       const pass = prettyFormatted === expected;