Skip to content

Use "ember-test-selectors" for UI tests #1138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/components/crate-row.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import Component from '@ember/component';

export default Component.extend({
classNames: ['crate', 'row']
classNames: ['crate', 'row'],

'data-test-crate-row': true,
});
9 changes: 5 additions & 4 deletions app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,18 @@
</h1>
{{/link-to}}

<form class='search' action='/search' {{ action "search" on="submit" }} >
<form class='search' action='/search' {{ action "search" on="submit" }} data-test-search-form>
{{input type="text" class="search" name="q" id="cargo-desktop-search"
placeholder="Click or press 'S' to search..."
value=search
autofocus="autofocus"
tabindex="1"
required=true}}
required=true
data-test-search-input=true}}
</form>

<div class='nav'>
{{#link-to "crates" (query-params letter="null" page=1)}}
{{#link-to "crates" (query-params letter="null" page=1) data-test-all-crates-link}}
Browse All Crates
{{/link-to}}
<span class="sep">|</span>
Expand Down Expand Up @@ -70,7 +71,7 @@
{{/rl-dropdown}}
{{/rl-dropdown-container}}
{{else}}
{{#link-to "login"}}
{{#link-to "login" data-test-login-link}}
{{svg-jar "lock"}}
Log in with GitHub
{{/link-to}}
Expand Down
10 changes: 5 additions & 5 deletions app/templates/categories.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
</div>

<div id='results'>
<div class='nav'>
<div class='nav' data-test-categories-nav>
<span class='amt small'>
Displaying
<span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
of <span class='total'>{{ totalItems }}</span> total results
</span>
</div>

<div class='sort'>
<div class='sort' data-test-categories-sort>
<span class='small'>Sort by</span>
{{#rl-dropdown-container class="dropdown-container"}}
{{#rl-dropdown-toggle tagName="a" class="dropdown"}}
{{#rl-dropdown-toggle tagName="a" class="dropdown" data-test-current-order=true}}
{{svg-jar "sort"}}
{{ currentSortBy }}
<span class='arrow'></span>
Expand All @@ -41,11 +41,11 @@

<div class='white-rows'>
{{#each model as |category|}}
<div class='row'>
<div class='row' data-test-category={{category.slug}}>
<div class='desc'>
<div class='info'>
{{link-to category.category "category" category.slug}}
<span class='small'>
<span class='small' data-test-crate-count>
{{ pluralize (format-num category.crates_cnt) "crate" }}
</span>
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/templates/category/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@

<h2>Crates</h2>
<div id='results'>
<div class='nav'>
<div class='nav' data-test-category-nav>
<span class='amt small'>
Displaying
<span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
of <span class='total'>{{ totalItems }}</span> total results
</span>
</div>

<div class='sort'>
<div class='sort' data-test-category-sort>
<span class='small'>Sort by</span>
{{#rl-dropdown-container class="dropdown-container"}}
{{#rl-dropdown-toggle tagName="a" class="dropdown"}}
{{#rl-dropdown-toggle tagName="a" class="dropdown" data-test-current-order=true}}
{{svg-jar "sort"}}
{{ currentSortBy }}
<span class='arrow'></span>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/crate-list.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ul>
{{#each crates as |crate|}}
{{#each crates as |crate index|}}
<li>
{{#link-to 'crate' crate.id class='name'}}
{{#link-to 'crate' crate.id class='name' data-test-crate-link=index}}
<span>{{ crate.name }} ({{ crate.max_version }})</span>
<div class='arrow-in-list'>
{{svg-jar "right-arrow"}}
Expand Down
13 changes: 7 additions & 6 deletions app/templates/components/crate-row.hbs
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
<div class='desc'>
<div class='info'>
{{#link-to 'crate' crate.id}}{{ crate.name }}{{/link-to}}
{{#link-to 'crate' crate.id data-test-crate-link}}{{ crate.name }}{{/link-to}}
<span class='vers'>
<img
src="https://img.shields.io/crates/v/{{ crate.name }}.svg"
alt="{{ crate.max_version }}"
title="{{ crate.name }}’s current version badge" />
title="{{ crate.name }}’s current version badge"
data-test-version-badge />
</span>
{{#each crate.annotated_badges as |badge|}}
{{component badge.component_name badge=badge}}
{{component badge.component_name badge=badge data-test-badge=badge.badge_type}}
{{/each}}
</div>
<div class='summary'>
<div class='summary' data-test-description>
<span class='small'>
{{ truncate-text crate.description }}
</span>
</div>
</div>
<div class='stats'>
<div class='downloads'>
<div class='downloads' data-test-downloads>
{{svg-jar "download"}}
<span class='num'>All-Time: {{ format-num crate.downloads }}</span>
</div>
<div class="recent-downloads">
<div class="recent-downloads" data-test-recent-downloads>
{{svg-jar "download"}}
<span class='num'><abbr title="Downloads in the last 90 days">Recent:</abbr> {{ format-num crate.recent_downloads }}</span>
</div>
Expand Down
18 changes: 9 additions & 9 deletions app/templates/crate/version.hbs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{{title crate.name}}

<div id='crates-heading'>
<div id='crates-heading' data-test-heading>
<div class="wide">
<div class='info'>
{{svg-jar "crate"}}
<h1>{{ crate.name }}</h1>
<h2>{{ currentVersion.num }}</h2>
<h1 data-test-crate-name>{{ crate.name }}</h1>
<h2 data-test-crate-version>{{ currentVersion.num }}</h2>
</div>

<div class='right'>
Expand Down Expand Up @@ -44,7 +44,7 @@
{{/if}}
{{#if crate.reverse_dependencies}}
<li>
{{#link-to 'crate.reverse_dependencies' (query-params dependency=crate.crate_id)}}
{{#link-to 'crate.reverse_dependencies' (query-params dependency=crate.crate_id) data-test-reverse-deps-link=true}}
Dependent crates
{{/link-to}}
</li>
Expand Down Expand Up @@ -137,7 +137,7 @@
{{#if currentVersion.license}}
<div>
<h3>License</h3>
<p class="license">{{ currentVersion.license }}</p>
<p class="license" data-test-license>{{ currentVersion.license }}</p>
</div>
{{/if}}

Expand Down Expand Up @@ -169,18 +169,18 @@

<div>
<h3>Owners</h3>
<ul class='owners'>
<ul class='owners' data-test-owners>
{{#each crate.owner_team as |team|}}
<li>
{{#link-to team.kind team.login}}
{{#link-to team.kind team.login data-test-team-link=team.login}}
{{user-avatar user=team size='medium-small'}}
{{/link-to}}
</li>
{{/each}}

{{#each crate.owner_user as |user|}}
<li>
{{#link-to user.kind user.login}}
{{#link-to user.kind user.login data-test-user-link=user.login}}
{{user-avatar user=user size='medium-small'}}
{{/link-to}}
</li>
Expand All @@ -205,7 +205,7 @@
</ul>
<span class='small'>
{{#if hasMoreVersions}}
{{#link-to 'crate.versions' crate}}
{{#link-to 'crate.versions' crate data-test-all-versions-link=true}}
show all {{ crate.versions.length }} versions
{{/link-to}}
{{/if}}
Expand Down
18 changes: 9 additions & 9 deletions app/templates/crates.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@
</div>

<div id='results'>
<div class='nav'>
<div class='nav' data-test-crates-nav>
<span class='amt small'>
Displaying
<span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
of <span class='total'>{{ totalItems }}</span> total results
<span class='cur' data-test-current-rows>{{ currentPageStart }}-{{ currentPageEnd }}</span>
of <span class='total' data-test-total-rows>{{ totalItems }}</span> total results
</span>
</div>

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

{{#rl-dropdown-container class="dropdown-container"}}
{{#rl-dropdown-toggle tagName="a" class="dropdown"}}
{{#rl-dropdown-toggle tagName="a" class="dropdown" data-test-current-order=true}}
{{svg-jar "sort"}}
{{ currentSortBy }}
<span class='arrow'></span>
Expand Down Expand Up @@ -66,21 +66,21 @@
</div>

<div id='crates' class='white-rows'>
{{#each model as |crate|}}
{{crate-row crate=crate}}
{{#each model as |crate index|}}
{{crate-row crate=crate data-test-crate-row=index}}
{{/each}}
</div>

<div class='pagination'>
{{#link-to (query-params page=prevPage) class="prev" rel="prev" title="previous page"}}
{{#link-to (query-params page=prevPage) class="prev" rel="prev" title="previous page" data-test-pagination-prev=true}}
{{svg-jar "left-pag"}}
{{/link-to}}
{{#each pages as |page|}}
{{#link-to (query-params page=page)}}
{{ page }}
{{/link-to}}
{{/each}}
{{#link-to (query-params page=nextPage) class="next" rel="next" title="next page"}}
{{#link-to (query-params page=nextPage) class="next" rel="next" title="next page" data-test-pagination-next=true}}
{{svg-jar "right-pag"}}
{{/link-to}}
</div>
18 changes: 9 additions & 9 deletions app/templates/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h1>The Rust community&rsquo;s crate registry</h1>

<div class='links'>
{{#link-to "install" class='yellow-button'}}
{{#link-to "install" class='yellow-button' data-test-install-cargo-link=true}}
{{svg-jar "button-download"}}
Install Cargo
{{/link-to}}
Expand All @@ -24,39 +24,39 @@
<div id='stats'>
<div class='downloads'>
{{svg-jar "download"}}
<span class='num'>{{format-num model.num_downloads}}</span>
<span class='num' data-test-total-downloads>{{format-num model.num_downloads}}</span>
<span class='desc small'>Downloads</span>
</div>
<div class='crates'>
{{svg-jar "crate"}}
<span class='num'>{{format-num model.num_crates}}</span>
<span class='num' data-test-total-crates>{{format-num model.num_crates}}</span>
<span class='desc small'>Crates in stock</span>
</div>
</div>
</div>

<div id='home-crates' class='crate-lists'>
<div id='new-crates'>
<div id='new-crates' data-test-new-crates>
<h2>New Crates</h2>
{{crate-list crates=model.new_crates}}
</div>
<div id='most-downloaded'>
<div id='most-downloaded' data-test-most-downloaded>
<h2>Most Downloaded</h2>
{{crate-list crates=model.most_downloaded}}
</div>
<div id='just-updated'>
<div id='just-updated' data-test-just-updated>
<h2>Just Updated</h2>
{{crate-list crates=model.just_updated}}
</div>
<div id='most-recently-downloaded'>
<div id='most-recently-downloaded' data-test-most-recently-downloaded>
<h2>Most Recent Downloads</h2>
{{crate-list crates=model.most_recently_downloaded}}
</div>
<div id='keywords'>
<div id='keywords' data-test-keywords>
<h2>Popular Keywords {{#link-to 'keywords'}}(see all){{/link-to}}</h2>
{{keyword-list keywords=model.popular_keywords}}
</div>
<div id='categories'>
<div id='categories' data-test-categories>
<h2>Popular Categories {{#link-to 'categories'}}(see all){{/link-to}}</h2>
{{category-list categories=model.popular_categories}}
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/templates/keyword/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
</div>

<div id='results'>
<div class='nav'>
<div class='nav' data-test-keyword-nav>
<span class='amt small'>
Displaying
<span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
of <span class='total'>{{ totalItems }}</span> total results
</span>
</div>

<div class='sort'>
<div class='sort' data-test-keyword-sort>
<span class='small'>Sort by</span>
{{#rl-dropdown-container class="dropdown-container"}}
{{#rl-dropdown-toggle tagName="a" class="dropdown"}}
{{#rl-dropdown-toggle tagName="a" class="dropdown" data-test-current-order=true}}
{{svg-jar "sort"}}
{{ currentSortBy }}
<span class='arrow'></span>
Expand Down
6 changes: 3 additions & 3 deletions app/templates/keywords.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
</div>

<div id='results'>
<div class='nav'>
<div class='nav' data-test-keywords-nav>
<span class='amt small'>
Displaying
<span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
of <span class='total'>{{ totalItems }}</span> total results
</span>
</div>

<div class='sort'>
<div class='sort' data-test-keywords-sort>
<span class='small'>Sort by</span>
{{#rl-dropdown-container class="dropdown-container"}}
{{#rl-dropdown-toggle tagName="a" class="dropdown"}}
{{#rl-dropdown-toggle tagName="a" class="dropdown" data-test-current-order=true}}
{{svg-jar "sort"}}
{{ currentSortBy }}
<span class='arrow'></span>
Expand Down
Loading