Skip to content

Commit 13078be

Browse files
committed
templates/crates: Use test-selectors
1 parent 585e8ba commit 13078be

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

app/templates/crates.hbs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@
2626
</div>
2727

2828
<div id='results'>
29-
<div class='nav'>
29+
<div class='nav' data-test-crates-nav>
3030
<span class='amt small'>
3131
Displaying
32-
<span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
33-
of <span class='total'>{{ totalItems }}</span> total results
32+
<span class='cur' data-test-current-rows>{{ currentPageStart }}-{{ currentPageEnd }}</span>
33+
of <span class='total' data-test-total-rows>{{ totalItems }}</span> total results
3434
</span>
3535
</div>
3636

37-
<div class='sort'>
37+
<div class='sort' data-test-crates-sort>
3838
<span class='small'>Sort by</span>
3939

4040
{{#rl-dropdown-container class="dropdown-container"}}
41-
{{#rl-dropdown-toggle tagName="a" class="dropdown"}}
41+
{{#rl-dropdown-toggle tagName="a" class="dropdown" data-test-current-order=true}}
4242
{{svg-jar "sort"}}
4343
{{ currentSortBy }}
4444
<span class='arrow'></span>
@@ -66,21 +66,21 @@
6666
</div>
6767

6868
<div id='crates' class='white-rows'>
69-
{{#each model as |crate|}}
70-
{{crate-row crate=crate}}
69+
{{#each model as |crate index|}}
70+
{{crate-row crate=crate data-test-crate-row=index}}
7171
{{/each}}
7272
</div>
7373

7474
<div class='pagination'>
75-
{{#link-to (query-params page=prevPage) class="prev" rel="prev" title="previous page"}}
75+
{{#link-to (query-params page=prevPage) class="prev" rel="prev" title="previous page" data-test-pagination-prev=true}}
7676
{{svg-jar "left-pag"}}
7777
{{/link-to}}
7878
{{#each pages as |page|}}
7979
{{#link-to (query-params page=page)}}
8080
{{ page }}
8181
{{/link-to}}
8282
{{/each}}
83-
{{#link-to (query-params page=nextPage) class="next" rel="next" title="next page"}}
83+
{{#link-to (query-params page=nextPage) class="next" rel="next" title="next page" data-test-pagination-next=true}}
8484
{{svg-jar "right-pag"}}
8585
{{/link-to}}
8686
</div>

tests/acceptance/crates-test.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ test('visiting the crates page from the front page', async function(assert) {
77
server.loadFixtures();
88

99
await visit('/');
10-
await click('a[href="/crates"]');
10+
await click('[data-test-all-crates-link]');
1111

1212
assert.equal(currentURL(), '/crates');
1313
assert.equal(document.title, 'Crates - Cargo: packages for Rust');
@@ -17,7 +17,7 @@ test('visiting the crates page directly', async function(assert) {
1717
server.loadFixtures();
1818

1919
await visit('/crates');
20-
await click('a[href="/crates"]');
20+
await click('[data-test-all-crates-link]');
2121

2222
assert.equal(currentURL(), '/crates');
2323
assert.equal(document.title, 'Crates - Cargo: packages for Rust');
@@ -28,39 +28,39 @@ test('listing crates', async function(assert) {
2828

2929
await visit('/crates');
3030

31-
assert.dom('.amt.small .cur').hasText('1-10');
32-
assert.dom('.amt.small .total').hasText('19');
31+
assert.dom('[data-test-crates-nav] [data-test-current-rows]').hasText('1-10');
32+
assert.dom('[data-test-crates-nav] [data-test-total-rows]').hasText('19');
3333
});
3434

3535
test('navigating to next page of crates', async function(assert) {
3636
server.loadFixtures();
3737

3838
await visit('/crates');
39-
await click('.pagination .next');
39+
await click('[data-test-pagination-next]');
4040

4141
assert.equal(currentURL(), '/crates?page=2');
42-
assert.dom('.amt.small .cur').hasText('11-19');
43-
assert.dom('.amt.small .total').hasText('19');
42+
assert.dom('[data-test-crates-nav] [data-test-current-rows]').hasText('11-19');
43+
assert.dom('[data-test-crates-nav] [data-test-total-rows]').hasText('19');
4444
});
4545

4646
test('crates default sort is alphabetical', async function(assert) {
4747
server.loadFixtures();
4848

4949
await visit('/crates');
5050

51-
assert.dom('div.sort div.dropdown-container a.dropdown').hasText('Alphabetical');
51+
assert.dom('[data-test-crates-sort] [data-test-current-order]').hasText('Alphabetical');
5252
});
5353

5454
test('downloads appears for each crate on crate list', async function(assert) {
5555
server.loadFixtures();
5656

5757
await visit('/crates');
58-
assert.dom('div.downloads span.num').hasText('All-Time: 497');
58+
assert.dom('[data-test-crate-row="0"] [data-test-downloads]').hasText('All-Time: 497');
5959
});
6060

6161
test('recent downloads appears for each crate on crate list', async function(assert) {
6262
server.loadFixtures();
6363

6464
await visit('/crates');
65-
assert.dom('div.recent-downloads span.num').hasText('Recent: 497');
65+
assert.dom('[data-test-crate-row="0"] [data-test-recent-downloads]').hasText('Recent: 497');
6666
});

0 commit comments

Comments
 (0)