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

FIX: Set default value for poll result field (#10178)

This commit is contained in:
Bianca Nenciu 2020-07-07 17:23:21 +03:00 committed by GitHub
parent 57d46694c5
commit 10e2578751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
View File

@ -350,6 +350,7 @@ export default Controller.extend({
pollStep: 1,
autoClose: false,
chartType: BAR_CHART_TYPE,
pollResult: this.alwaysPollResult,
pollGroups: null,
date: moment()
.add(1, "day")

23
plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
View File

@ -220,7 +220,7 @@ test("number pollOutput", function(assert) {
assert.equal(
controller.pollOutput,
"[poll type=number min=1 max=20 step=1]\n[/poll]\n",
"[poll type=number results=always min=1 max=20 step=1]\n[/poll]\n",
"it should return the right output"
);
@ -228,7 +228,7 @@ test("number pollOutput", function(assert) {
assert.equal(
controller.pollOutput,
"[poll type=number min=1 max=20 step=2]\n[/poll]\n",
"[poll type=number results=always min=1 max=20 step=2]\n[/poll]\n",
"it should return the right output"
);
@ -236,7 +236,7 @@ test("number pollOutput", function(assert) {
assert.equal(
controller.pollOutput,
"[poll type=number min=1 max=20 step=2 public=true]\n[/poll]\n",
"[poll type=number results=always min=1 max=20 step=2 public=true]\n[/poll]\n",
"it should return the right output"
);
@ -244,7 +244,7 @@ test("number pollOutput", function(assert) {
assert.equal(
controller.pollOutput,
"[poll type=number min=1 max=20 step=1 public=true]\n[/poll]\n",
"[poll type=number results=always min=1 max=20 step=1 public=true]\n[/poll]\n",
"it should return the right output"
);
});
@ -262,7 +262,7 @@ test("regular pollOutput", function(assert) {
assert.equal(
controller.pollOutput,
"[poll type=regular chartType=bar]\n* 1\n* 2\n[/poll]\n",
"[poll type=regular results=always chartType=bar]\n* 1\n* 2\n[/poll]\n",
"it should return the right output"
);
@ -270,7 +270,7 @@ test("regular pollOutput", function(assert) {
assert.equal(
controller.pollOutput,
"[poll type=regular public=true chartType=bar]\n* 1\n* 2\n[/poll]\n",
"[poll type=regular results=always public=true chartType=bar]\n* 1\n* 2\n[/poll]\n",
"it should return the right output"
);
@ -278,7 +278,7 @@ test("regular pollOutput", function(assert) {
assert.equal(
controller.get("pollOutput"),
"[poll type=regular public=true chartType=bar groups=test]\n* 1\n* 2\n[/poll]\n",
"[poll type=regular results=always public=true chartType=bar groups=test]\n* 1\n* 2\n[/poll]\n",
"it should return the right output"
);
});
@ -297,7 +297,7 @@ test("multiple pollOutput", function(assert) {
assert.equal(
controller.pollOutput,
"[poll type=multiple min=1 max=2 chartType=bar]\n* 1\n* 2\n[/poll]\n",
"[poll type=multiple results=always min=1 max=2 chartType=bar]\n* 1\n* 2\n[/poll]\n",
"it should return the right output"
);
@ -305,7 +305,7 @@ test("multiple pollOutput", function(assert) {
assert.equal(
controller.pollOutput,
"[poll type=multiple min=1 max=2 public=true chartType=bar]\n* 1\n* 2\n[/poll]\n",
"[poll type=multiple results=always min=1 max=2 public=true chartType=bar]\n* 1\n* 2\n[/poll]\n",
"it should return the right output"
);
});
@ -320,6 +320,11 @@ test("staff_only option is not present for non-staff", function(assert) {
);
});
test("poll result is always by default", function(assert) {
const controller = this.subject();
assert.equal(controller.pollResult, "always");
});
test("staff_only option is present for staff", function(assert) {
const controller = this.subject();
controller.currentUser = { staff: true };