Merge adb7811 into 34fd1cd

FDMediagroep · Jan 9, 2024 · 1e09ff0 · 1e09ff0
2 parents 34fd1cd + adb7811
commit 1e09ff0
Show file tree

Hide file tree

Showing 11 changed files with 274 additions and 654 deletions.
diff --git a/README.md b/README.md
@@ -1745,8 +1745,8 @@ import { Modal } from '@fdmg/design-system/components/modal/Modal';
 
 function Foo() {
     return (
-        <Modal opened={true} onClose={() => {}>
-            <>
+        <Modal opened={true} onClose={() => {}}>
+            <section className="xs_p+4">
                 <h2>Abonnement wijzigen of opzeggen</h2>
                 <p>
                     Voor wijzigingen kunt u elk moment bellen. Voor
@@ -1763,7 +1763,8 @@ function Foo() {
                     Ook kijken we graag samen met u naar een
                     abonnementsvorm die wellicht beter bij u past.
                 </p>
-            </>
+                <ButtonCta className="close">Sluiten</ButtonCta>
+            </section>
         </Modal>
     );
 }

diff --git a/__tests__/components/Modal.test.tsx b/__tests__/components/Modal.test.tsx
diff --git a/__tests__/components/ab/Experiment.test.tsx b/__tests__/components/ab/Experiment.test.tsx
@@ -68,25 +68,21 @@ describe('AB Experiment', () => {
         // Assert we are in variant 1
         expect(getByText('Headline 1')).toBeTruthy();
         // Assert debug button is rendered
-        expect(document.querySelectorAll('h2').length).toEqual(1);
+        expect(document.querySelectorAll('h2').length).toEqual(2);
         // Click on debug button
         fireEvent.click(getByText('A/B Test experiment', { exact: false }));
         // Assert debug modal is rendered
         expect(getByText('Test experiment')).toBeTruthy();
-        expect(
-            document.querySelectorAll('.debug-modal-content h2').length
-        ).toEqual(1);
+        expect(document.querySelectorAll('.debug-modal h2').length).toEqual(2);
         expect(getByTitle('Remove experiment cookie')).toBeTruthy();
         fireEvent.click(getByTitle('Remove experiment cookie'));
 
         // Click variant 2 in debug modal
         fireEvent.click(document.querySelectorAll('label')[1]);
 
         // Close debug modal
-        fireEvent.click(
-            document.querySelector('.debug-modal-content h2 span')!
-        );
-        expect(document.querySelectorAll('h2').length).toEqual(1);
+        fireEvent.click(document.querySelector('.debug-modal h2 span')!);
+        expect(document.querySelectorAll('h2').length).toEqual(2);
 
         // Assert we are in variant 2
         expect(getByText('Headline 2')).toBeTruthy();

diff --git a/next.config.js b/next.config.js
@@ -37,6 +37,38 @@ module.exports = {
             },
         ];
     },
+    headers() {
+        return [
+            {
+                // Apply these headers to all routes in your application.
+                source: '/:path*',
+                headers: [
+                    {
+                        key: 'Content-Security-Policy',
+                        value: "default-src http: https: data: blob: ws: wss: 'unsafe-inline' 'unsafe-eval';"
+                            .replace(/\s{2,}/g, ' ')
+                            .trim(),
+                    },
+                    {
+                        key: 'Referrer-Policy',
+                        value: 'strict-origin-when-cross-origin',
+                    },
+                    {
+                        key: 'strict-transport-security',
+                        value: 'max-age=15724800',
+                    },
+                    {
+                        key: 'X-Content-Type-Options',
+                        value: 'nosniff',
+                    },
+                    {
+                        key: 'X-Frame-Options',
+                        value: 'SAMEORIGIN',
+                    },
+                ],
+            },
+        ];
+    },
     webpack: (config, options) => {
         // Markdown
         config.module.rules.push({