Merge branch 'main' into feature/3384-align-checkbox-indent-line

ONSdigital · Nov 12, 2024 · a0f046b · a0f046b
2 parents c49d156 + 1300be4
commit a0f046b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/components/button/_macro.njk b/src/components/button/_macro.njk
@@ -11,7 +11,7 @@
             {# Default icon position before label #}
             {% set iconPosition = "before" %}
         {% endif %}
-    {% elif params.iconType is not defined and params.noIcon is not defined %}
+    {% elif params.iconType is not defined and params.noIcon != true %}
         {% if params.url and params.newWindow %}
             {# CTA link opening in new tab #}
             {% set iconType = "external-link" %}

diff --git a/src/components/button/_macro.spec.js b/src/components/button/_macro.spec.js
@@ -351,6 +351,30 @@ describe('macro: button', () => {
             expect(iconsSpy.occurrences[0].iconType).toBe('arrow-next');
         });
 
+        it('has no icon when noIcon is set to true', () => {
+            const faker = templateFaker();
+            const iconsSpy = faker.spy('icon');
+
+            faker.renderComponent('button', {
+                url: 'http://example.com',
+                noIcon: true,
+            });
+
+            expect(iconsSpy.occurrences[0]).toBeUndefined();
+        });
+
+        it('has default `arrow-next` icon when noIcon is set to false', () => {
+            const faker = templateFaker();
+            const iconsSpy = faker.spy('icon');
+
+            faker.renderComponent('button', {
+                url: 'http://example.com',
+                noIcon: false,
+            });
+
+            expect(iconsSpy.occurrences[0].iconType).toBe('arrow-next');
+        });
+
         it('opens in a new window when `newWindow` is `true`', () => {
             const $ = cheerio.load(
                 renderComponent('button', {