Skip to content

Commit 8e9ecf4

Browse files
authored
Merge pull request #257 from CrowdStrike/remove-button-test-helpers
chore: remove Button's test helpers
2 parents 21ff39a + ce91639 commit 8e9ecf4

File tree

4 files changed

+14
-40
lines changed

4 files changed

+14
-40
lines changed

.changeset/tidy-roses-cross.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@crowdstrike/ember-toucan-core': minor
3+
'@crowdstrike/ember-toucan-form': minor
4+
---
5+
6+
Remove Button's test helpers

packages/ember-toucan-core/src/test-support/components/button.ts

-23
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
export { AutocompletePageObject } from './components/autocomplete';
2-
export { ButtonPageObject } from './components/button';
32
export { MultiselectPageObject } from './components/multiselect';

test-app/tests/integration/components/button-test.gts

+8-16
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
1-
import { render, setupOnerror } from '@ember/test-helpers';
1+
import { click, render, setupOnerror } from '@ember/test-helpers';
22
import { module, test } from 'qunit';
33

44
import Button from '@crowdstrike/ember-toucan-core/components/button';
55
import { setupRenderingTest } from 'test-app/tests/helpers';
66

7-
import { ButtonPageObject } from '@crowdstrike/ember-toucan-core/test-support';
8-
97
module('Integration | Component | button', function (hooks) {
108
setupRenderingTest(hooks);
119

12-
let buttonPageObject = new ButtonPageObject('[data-button]');
13-
1410
test('it renders', async function (assert) {
1511
await render(<template>
1612
<Button data-button>
1713
text
1814
</Button>
1915
</template>);
2016

21-
assert.strictEqual(buttonPageObject.text, 'text');
22-
assert.false(buttonPageObject.isDisabled);
17+
assert.dom('[data-button]').hasText('text');
18+
assert.dom('[data-button]').isEnabled();
2319

2420
assert
25-
.dom(buttonPageObject.element)
21+
.dom('[data-button]')
2622
.hasAttribute('type', 'button', 'Expected default type to be "button"');
2723
});
2824

@@ -35,8 +31,6 @@ module('Integration | Component | button', function (hooks) {
3531
</Button>
3632
</template>);
3733

38-
assert.true(buttonPageObject.isLoading);
39-
4034
assert
4135
.dom('[data-test-loading-content]')
4236
.exists('Expect to have loading named block rendered');
@@ -55,8 +49,6 @@ module('Integration | Component | button', function (hooks) {
5549
</Button>
5650
</template>);
5751

58-
assert.false(buttonPageObject.isLoading);
59-
6052
assert
6153
.dom('[data-test-loading]')
6254
.doesNotExist('Expected to NOT have loading named block rendered');
@@ -73,7 +65,7 @@ module('Integration | Component | button', function (hooks) {
7365
</Button>
7466
</template>);
7567

76-
assert.true(buttonPageObject.isDisabled);
68+
assert.dom('[data-button]').hasAttribute('aria-disabled', 'true');
7769
});
7870

7971
test('it yields a disabled named block when `@isDisabled={{true}}', async function (assert) {
@@ -123,7 +115,7 @@ module('Integration | Component | button', function (hooks) {
123115

124116
assert.verifySteps([]);
125117

126-
await buttonPageObject.click();
118+
await click('[data-button]');
127119

128120
assert.verifySteps(['clicked']);
129121
});
@@ -139,7 +131,7 @@ module('Integration | Component | button', function (hooks) {
139131

140132
assert.verifySteps([]);
141133

142-
await buttonPageObject.click();
134+
await click('[data-button]');
143135

144136
assert.verifySteps([]);
145137
});
@@ -150,7 +142,7 @@ module('Integration | Component | button', function (hooks) {
150142
setupOnerror((e: Error) => {
151143
assert.ok(
152144
e.message.includes('Invalid variant for Button'),
153-
'Expected assertion error message'
145+
'Expected assertion error message',
154146
);
155147
});
156148

0 commit comments

Comments
 (0)