Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

faster tests

This commit is contained in:
Joffrey JAFFEUX 2017-07-19 13:15:18 +02:00
parent b83f430ef0
commit c99a5bce8f
2 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/components/emoji-picker.js.es6
View File

@ -111,7 +111,7 @@ export default Ember.Component.extend({
this._bindEvents();
Ember.run.later(this, function() {
this._later(this, function() {
this._setDiversity();
this._positionPicker();
this._scrollTo();
@ -119,6 +119,14 @@ export default Ember.Component.extend({
});
},
_later(context, handler, timeout) {
if(Ember.testing) {
handler.bind(context)();
} else {
Ember.run.later(context, handler, timeout);
}
},
_bindEvents() {
this._bindDiversityClick();
this._bindSectionsScroll();
@ -293,7 +301,7 @@ export default Ember.Component.extend({
if(preloadedSection && !preloadedSection.$section.hasClass("loaded")) {
preloadedSection.$section.addClass("loaded");
const $visibleEmojis = preloadedSection.$section.find(".emoji[src='']");
Ember.run.later(() => { this._loadVisibleEmojis($visibleEmojis); }, 1500);
this._later(this, function() { this._loadVisibleEmojis($visibleEmojis) }, 1500)
}
}
},

42
test/javascripts/acceptance/emoji-picker-test.js.es6
View File

@ -112,42 +112,26 @@ QUnit.test("emoji picker has a list of recently used emojis", assert => {
"it adds the emoji code to the recently used emojis list"
);
});
});
QUnit.test("emoji picker can clear recently used emojis", assert => {
visit("/t/internationalization-localization/280");
click("#topic-footer-buttons .btn.create");
click("button.emoji.btn");
click(".emoji-picker a[title='grinning']");
click(".emoji-picker a[title='sunglasses']");
click(".emoji-picker a[title='sunglasses']");
click(".emoji-picker .clear-recent");
andThen(() => {
assert.equal(
find('.section[data-section="recent"] .section-group img.emoji').length,
2
0,
"it has cleared recent emojis"
);
click(".emoji-picker .clear-recent");
andThen(() => {
assert.equal(
find('.section[data-section="recent"] .section-group img.emoji').length,
0,
"it has cleared recent emojis"
);
assert.equal(
find('.section[data-section="recent"]').css("display"),
"none",
"it hides recent section"
);
assert.equal(
find('.section[data-section="recent"]').css("display"),
"none",
"it hides recent section"
);
assert.equal(
find('.category-icon a[title="recent"]').parent().css("display"),
"none",
"it hides recent category icon"
);
});
assert.equal(
find('.category-icon a[title="recent"]').parent().css("display"),
"none",
"it hides recent category icon"
);
});
});