merge master

This commit is contained in:
Neil Lalonde
2016-03-31 17:33:25 -04:00
parent 95f2ac6535
commit 01d0aeb5a9
6404 changed files with 88070 additions and 62390 deletions
@@ -20,8 +20,6 @@ componentTest('with a label', {
test(assert) {
const $a = this.$('a');
assert.equal($a.text(), I18n.t('user.preferences'));
assert.equal($a.attr('title'), I18n.t('user.preferences'));
assert.equal($a.attr('aria-title'), I18n.t('user.preferences'));
}
});
@@ -31,8 +29,6 @@ componentTest('with a label and icon', {
const $a = this.$('a');
assert.ok(this.$('i.fa-gear', $a).length, 'shows the icon');
assert.equal($a.text(), ` ${I18n.t('user.preferences')}`, "includes a space");
assert.equal($a.attr('title'), I18n.t('user.preferences'));
assert.equal($a.attr('aria-title'), I18n.t('user.preferences'));
}
});