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

Fix broken qunit tests.

This commit is contained in:
Guo Xiang Tan 2017-02-03 12:09:30 +08:00
parent 7a243e859e
commit 0988420b48
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
View File

@ -190,7 +190,7 @@ createWidget('discourse-poll-standard-results', {
return ordered.map((option, idx) => {
const contents = [];
const per = rounded[idx].toString();
const chosen = attrs.vote.includes(option.id);
const chosen = (attrs.vote || []).includes(option.id);
contents.push(h('div.option',
h('p', [ h('span.percentage', `${per}%`), optionHtml(option) ])

7
test/javascripts/acceptance/topic-test.js.es6
View File

@ -83,12 +83,11 @@ test("Reply as new topic", () => {
equal(
find('.d-editor-input').val().trim(),
"Continuing the discussion from [Internationalization / localization](http://localhost:3000/t/internationalization-localization/280):",
`Continuing the discussion from [Internationalization / localization](${window.location.origin}/t/internationalization-localization/280):`,
"it fills composer with the ring string"
);
equal(
find('#select2-chosen-1').text().trim(), "feature",
find('.category-combobox').select2('data').text, "feature",
"it fills category selector with the right category"
);
});
@ -104,7 +103,7 @@ test("Reply as new message", () => {
equal(
find('.d-editor-input').val().trim(),
"Continuing the discussion from [PM for testing](http://localhost:3000/t/pm-for-testing/12):",
`Continuing the discussion from [PM for testing](${window.location.origin}/t/pm-for-testing/12):`,
"it fills composer with the ring string"
);