gatsby-core-theme 24.0.2 → 24.0.3

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [24.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v24.0.2...v24.0.3) (2023-07-04)
+
+
+### Bug Fixes
+
+* make test for content ([c943167](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c943167615cb964d6edd5a5732b9c54c2df7be44))
+* validate if h2 isn't empty ([2b42f4b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2b42f4b83c93a15471191cd3464f1c06488eddec))
+
+
+* Merge branch 'fix-bug-placheloder' into 'master' ([5346c7b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5346c7b20a2163aa8b7f144c486ea168b4cb4d97))
+
 ## [24.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v24.0.1...v24.0.2) (2023-07-04)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "24.0.2",
+  "version": "24.0.3",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",

package/src/components/molecules/content/content.test.js

@@ -1,10 +1,31 @@
 import React from 'react';
-import { render, cleanup, fireEvent } from '@testing-library/react';
+import { render, cleanup, fireEvent, screen } from '@testing-library/react';
+import { generatePlaceholderString } from '../../../helpers/generators';
 import '@testing-library/jest-dom/extend-expect';
 import { getSingleContentData } from '~tests/factories/modules/content.factory';
 import Content from '.';
 
 describe('Content Component', () => {
+  const page = {
+    siteInfo: {
+      site_name: 'My Site',
+    },
+    title: 'My Page',
+    relation: {
+      name: 'Page Relation',
+    },
+  };
+
+  const module = {
+    anchor_label: 'Anchor',
+    name: 'Module Name',
+    module_title: 'Module Title',
+    value: '<h2>[YEAR]</h2>',
+    style: 'default',
+    show_more_content: '<p>More content</p>',
+    show_more_enabled: '1',
+  };
+
   test('render content props', () => {
     const correctData = getSingleContentData('h4');
     const { container } = render(<Content module={correctData} />);
@@ -200,6 +221,17 @@ describe('Content Component', () => {
 
     expect(getByText('More COntent test')).toBeTruthy();
   });
+
+  test('renders content with placeholder string for h2', () => {
+    const { container } = render(<Content module={module} page={page} />);
+    expect(container.querySelector('h2')).toHaveTextContent('2023');
+  });
+
+  test('renders content without placeholder string for h2', () => {
+    module.value = '<h2></h2>';
+    const { container } = render(<Content module={module} page={page} />);
+    expect(container.querySelector('h2')).toHaveTextContent('');
+  });
 });
 afterEach(() => {
   cleanup();

package/src/components/molecules/content/index.js

@@ -63,7 +63,13 @@ const Content = ({ module, isHomepageFirstModule = false, isModuleIntroduction =
         pageTitle: page?.title,
         name: page?.relation?.name,
       };
-      node.children[0].data = generatePlaceholderString(node.children[0].data, translations, data);
+      // check if h2 is empty
+      if (node?.children[0]?.data !== undefined)
+        node.children[0].data = generatePlaceholderString(
+          node.children[0].data,
+          translations,
+          data
+        );
     }
 
     return null;