fix: upgrade intl-messageformat and tests

formatjs · Jul 25, 2019 · 1dfe7fd · 1dfe7fd
1 parent 6b6477a
commit 1dfe7fd
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 53 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "hoist-non-react-statics": "^3.3.0",
     "intl-format-cache": "^4.1.2",
     "intl-locales-supported": "^1.4.2",
-    "intl-messageformat": "^5.3.0",
+    "intl-messageformat": "^5.4.2",
     "intl-messageformat-parser": "^2.1.3",
     "invariant": "^2.1.1",
     "react": "^16.3.0",

diff --git a/test/unit/components/html-message.tsx b/test/unit/components/html-message.tsx
@@ -121,6 +121,6 @@ describe('<FormattedHTMLMessage>', () => {
       intl
     ).html();
 
-    expect(renderedHtml).toBe('<span>Hello, <b>[object Object]</b>!</span>');
+    expect(renderedHtml).not.toBe('<span>Hello, <b><i>Eric</i></b>!</span>');
   });
 });
diff --git a/test/unit/components/message.tsx b/test/unit/components/message.tsx
@@ -111,58 +111,78 @@ describe('<FormattedMessage>', () => {
     expect(rendered.text()).toBe('Jest');
   });
 
-  it('supports rich-text message formatting', () => {
-    const rendered = mountWithProvider(
-      {
-        id: 'hello',
-        defaultMessage: 'Hello, <b>{name}</b>!',
-        values: {
-          name: 'Jest',
-          b: (name: string) => <b>{name}</b>,
+  describe('rich text', function () {
+    it('supports legacy behavior', () => {
+      const rendered = mountWithProvider(
+        {
+          id: 'hello',
+          defaultMessage: 'Hello, {name}!',
+          values: {
+            name: <b>Jest</b>,
+          },
         },
-      },
-      intl
-    );
-
-    const nameNode = rendered.find('b');
-    expect(nameNode.type()).toBe('b');
-    expect(nameNode.text()).toBe('Jest');
-  });
-
-  it('supports rich-text message formatting w/ self-closing tag', () => {
-    const rendered = mountWithProvider(
-      {
-        id: 'hello',
-        defaultMessage: 'Hello, <name/>',
-        values: {
-          name: <b>Jest</b>,
+        intl
+      );
+
+      const nameNode = rendered.find('b');
+      expect(nameNode.type()).toBe('b');
+      expect(nameNode.text()).toBe('Jest');
+    });
+    it('supports rich-text message formatting', () => {
+      const rendered = mountWithProvider(
+        {
+          id: 'hello',
+          defaultMessage: 'Hello, <b>{name}</b>!',
+          values: {
+            name: 'Jest',
+            b: (name: string) => <b>{name}</b>,
+          },
         },
-      },
-      intl
-    );
-
-    const nameNode = rendered.find('b');
-    expect(nameNode.type()).toBe('b');
-    expect(nameNode.text()).toBe('Jest');
-  });
-
-  it('supports rich-text message formatting in function-as-child pattern', () => {
-    const rendered = mountWithProvider(
-      {
-        id: 'hello',
-        defaultMessage: 'Hello, <name/>',
-        values: {
-          name: <b>Jest</b>,
+        intl
+      );
+
+      const nameNode = rendered.find('b');
+      expect(nameNode.type()).toBe('b');
+      expect(nameNode.text()).toBe('Jest');
+    });
+
+    it('supports rich-text message formatting w/ self-closing tag', () => {
+      const rendered = mountWithProvider(
+        {
+          id: 'hello',
+          defaultMessage: 'Hello, <name/>',
+          values: {
+            name: <b>Jest</b>,
+          },
         },
-        children: (...chunks) => <strong>{chunks}</strong>,
-      },
-      intl
-    );
+        intl
+      );
+
+      const nameNode = rendered.find('b');
+      expect(nameNode.type()).toBe('b');
+      expect(nameNode.text()).toBe('Jest');
+    });
+
+    it('supports rich-text message formatting in function-as-child pattern', () => {
+      const rendered = mountWithProvider(
+        {
+          id: 'hello',
+          defaultMessage: 'Hello, <name/>',
+          values: {
+            name: <b>Jest</b>,
+          },
+          children: (...chunks) => <strong>{chunks}</strong>,
+        },
+        intl
+      );
+
+      const nameNode = rendered.find('b');
+      expect(nameNode.type()).toBe('b');
+      expect(nameNode.text()).toBe('Jest');
+    });
+  })
 
-    const nameNode = rendered.find('b');
-    expect(nameNode.type()).toBe('b');
-    expect(nameNode.text()).toBe('Jest');
-  });
+
 
   it('should re-render when `values` are different', () => {
     const descriptor = {