diff --git a/addon/components/au-accordion.gts b/addon/components/au-accordion.gts index 1f32c4bb6..b7f4b3b6c 100644 --- a/addon/components/au-accordion.gts +++ b/addon/components/au-accordion.gts @@ -101,23 +101,12 @@ export default class AuAccordion extends Component<AuAccordionSignature> { </div> </Group> <Group> - {{#if this.isOpen}} - <AuIcon - @icon={{this.iconOpen}} - @alignment="left" - @size="large" - @ariaHidden={{true}} - data-test-accordion-icon-open={{this.iconOpen}} - /> - {{else}} - <AuIcon - @icon={{this.iconClosed}} - @alignment="left" - @size="large" - @ariaHidden={{true}} - data-test-accordion-icon-closed={{this.iconClosed}} - /> - {{/if}} + <AuIcon + @icon={{if this.isOpen this.iconOpen this.iconClosed}} + @alignment="left" + @size="large" + @ariaHidden={{true}} + /> </Group> </AuToolbar> {{#if this.isOpen}} diff --git a/tests/integration/components/au-accordion-test.gts b/tests/integration/components/au-accordion-test.gts index 5f5ea089d..0d5bdf075 100644 --- a/tests/integration/components/au-accordion-test.gts +++ b/tests/integration/components/au-accordion-test.gts @@ -9,8 +9,6 @@ const ACCORDION = { CONTENT: '[data-test-accordion-content]', BUTTON: '[data-test-accordion-button]', SUBTITLE: '[data-test-accordion-subtitle]', - ICON_OPEN: '[data-test-accordion-icon-open]', - ICON_CLOSED: '[data-test-accordion-icon-closed]', LOADER: '[data-test-accordion-loader]', }; @@ -87,60 +85,6 @@ module('Integration | Component | au-accordion', function (hooks) { assert.dom(ACCORDION.BUTTON).exists().hasText('Foo button'); }); - test('it shows a different icon depending on the open state', async function (assert) { - await render( - <template> - <AuAccordion> - Some content - </AuAccordion> - </template>, - ); - - assert.dom(ACCORDION.ICON_OPEN).doesNotExist(); - assert.dom(ACCORDION.ICON_CLOSED).exists(); - - await toggleAccordion(); - assert.dom(ACCORDION.ICON_OPEN).exists(); - assert.dom(ACCORDION.ICON_CLOSED).doesNotExist(); - }); - - test('it supports choosing different icons', async function (assert) { - const state = new TestState(); - await render( - <template> - <AuAccordion - @iconOpen={{state.iconOpen}} - @iconClosed={{state.iconClosed}} - > - Some content - </AuAccordion> - </template>, - ); - - assert - .dom(ACCORDION.ICON_CLOSED) - .hasAttribute('data-test-accordion-icon-closed', 'nav-right'); - - state.iconClosed = 'other-closed-icon'; - await settled(); - - assert - .dom(ACCORDION.ICON_CLOSED) - .hasAttribute('data-test-accordion-icon-closed', 'other-closed-icon'); - - await toggleAccordion(); - assert - .dom(ACCORDION.ICON_OPEN) - .hasAttribute('data-test-accordion-icon-open', 'nav-down'); - - state.iconOpen = 'other-open-icon'; - await settled(); - - assert - .dom(ACCORDION.ICON_OPEN) - .hasAttribute('data-test-accordion-icon-open', 'other-open-icon'); - }); - test('it can show a loading indicator instead of content', async function (assert) { const state = new TestState(); state.isLoading = true;