From 10e25787510c8653228f81b3280058a5b1c63aac Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 7 Jul 2020 17:23:21 +0300
Subject: [PATCH] FIX: Set default value for poll result field (#10178)

---
 .../controllers/poll-ui-builder.js.es6        |  1 +
 .../controllers/poll-ui-builder-test.js.es6   | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index 0eca3fa8518..0dc7325150f 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -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")
diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
index e8ec02908c2..f582a3f948b 100644
--- a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
+++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
@@ -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 };