Fixed tests, now publicURL is in the fixture. Added one more just to …

…be sure.
plone · Sep 12, 2023 · f23da4f · f23da4f
1 parent 9442127
commit f23da4f
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 31 deletions.
diff --git a/src/components/theme/Logo/Logo.Multilingual.test.jsx b/src/components/theme/Logo/Logo.Multilingual.test.jsx
@@ -9,7 +9,6 @@ import Logo from './Logo';
 
 beforeAll(() => {
   config.settings.isMultilingual = true;
-  config.settings.publicURL = 'http://mysite.com';
 });
 
 const mockStore = configureStore();
@@ -49,6 +48,7 @@ describe('Multilingual Logo', () => {
     const json = component.toJSON();
     expect(json).toMatchSnapshot();
   });
+
   it('renders a logo component in a multilingual site language root', () => {
     const store = mockStore({
       intl: {
@@ -85,6 +85,7 @@ describe('Multilingual Logo', () => {
     const json = component.toJSON();
     expect(json).toMatchSnapshot();
   });
+
   it('renders a logo component with a custom logo in a non-root url', () => {
     const store = mockStore({
       intl: {
@@ -122,4 +123,42 @@ describe('Multilingual Logo', () => {
     const json = component.toJSON();
     expect(json).toMatchSnapshot();
   });
+
+  it('renders a logo component with a custom logo in a non-root url with path', () => {
+    const store = mockStore({
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+      navroot: {
+        data: {
+          id: 'http://localhost:3000/en/@navroot',
+          navroot: {
+            '@id': 'http://localhost:3000/en',
+            title: 'English',
+          },
+        },
+      },
+      router: {
+        location: {
+          pathname: '/en/my/path',
+        },
+      },
+      site: {
+        data: {
+          'plone.site_logo':
+            'http://localhost:3000/@@site-logo/logo.cab945d8.svg',
+        },
+      },
+    });
+    const component = renderer.create(
+      <Provider store={store}>
+        <MemoryRouter>
+          <Logo />
+        </MemoryRouter>
+      </Provider>,
+    );
+    const json = component.toJSON();
+    expect(json).toMatchSnapshot();
+  });
 });
diff --git a/src/components/theme/Logo/Logo.jsx b/src/components/theme/Logo/Logo.jsx
@@ -35,6 +35,7 @@ const Logo = () => {
 
   // remove trailing slash
   const currentURL = toPublicURL(pathname).replace(/\/$/, '');
+
   return (
     <ConditionalLink
       href={navroot?.navroot?.['@id']}

diff --git a/src/components/theme/Logo/__snapshots__/Logo.Multilingual.test.jsx.snap b/src/components/theme/Logo/__snapshots__/Logo.Multilingual.test.jsx.snap
@@ -1,51 +1,44 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Multilingual Logo renders a logo component in a multilingual site language root 1`] = `
-<a
-  className={null}
-  href="http://localhost:3000/en"
-  rel="noopener noreferrer"
-  target="_blank"
+<img
+  alt="English"
+  className="ui image"
+  src="Logo.svg"
   title="English"
->
-  <img
-    alt="English"
-    className="ui image"
-    src="Logo.svg"
-    title="English"
-  />
-</a>
+/>
 `;
 
 exports[`Multilingual Logo renders a logo component in a multilingual site root 1`] = `
-<a
-  className={null}
-  href="http://localhost:3000"
-  rel="noopener noreferrer"
-  target="_blank"
+<img
+  alt="Plone Site"
+  className="ui image"
+  src="Logo.svg"
   title="Plone Site"
->
-  <img
-    alt="Plone Site"
-    className="ui image"
-    src="Logo.svg"
-    title="Plone Site"
-  />
-</a>
+/>
 `;
 
 exports[`Multilingual Logo renders a logo component with a custom logo in a non-root url 1`] = `
+<img
+  alt="English"
+  className="ui image"
+  src="/@@site-logo/logo.cab945d8.svg"
+  title="English"
+/>
+`;
+
+exports[`Multilingual Logo renders a logo component with a custom logo in a non-root url with path 1`] = `
 <a
   className={null}
-  href="http://localhost:3000/en"
-  rel="noopener noreferrer"
-  target="_blank"
+  href="/en"
+  onClick={[Function]}
+  target={null}
   title="English"
 >
   <img
     alt="English"
     className="ui image"
-    src="http://localhost:3000/@@site-logo/logo.cab945d8.svg"
+    src="/@@site-logo/logo.cab945d8.svg"
     title="English"
   />
 </a>