From 9075d5a9f5b509490ca1a9dfc14773b44f173e0e Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Tue, 7 Jul 2020 10:24:37 +1000 Subject: [PATCH] Revert "FIX: Set default value for poll result field (#10044)" This reverts commit 40de5352248df3e17c7d790f5a0c89a2162cca46. Sadly this appears to break the JS test suite --- .../assets/javascripts/controllers/poll-ui-builder.js.es6 | 1 - .../test/javascripts/controllers/poll-ui-builder-test.js.es6 | 5 ----- 2 files changed, 6 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 0dc7325150f..0eca3fa8518 100644 --- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 @@ -350,7 +350,6 @@ 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 3eee6bb070f..e8ec02908c2 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 @@ -320,11 +320,6 @@ 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 };