FIX: staff should always be allowed to create polls if they are enabled

plugins/poll/test/javascripts/acceptance/poll-builder-allow-staff-test.js.es6

@@ -1,22 +0,0 @@
-import { acceptance } from "helpers/qunit-helpers";
-import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
-import { replaceCurrentUser } from "discourse/plugins/poll/helpers/replace-current-user";
-
-acceptance("Poll Builder - allow staff", {
-  loggedIn: true,
-  settings: {
-    poll_enabled: true,
-    poll_allow_staff_to_create: true,
-    poll_minimum_trust_level_to_create: 4
-  }
-});
-
-test("staff", (assert) => {
-  replaceCurrentUser({ staff: true, trust_level: 3 });
-
-  displayPollBuilderButton();
-
-  andThen(() => {
-    assert.ok(exists("button[title='Build Poll']"), "it shows the builder button");
-  });
-});

plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6

@@ -10,8 +10,8 @@ acceptance("Poll Builder - polls are disabled", {
   }
 });
 
-test("sufficient trust level", (assert) => {
-  replaceCurrentUser({ admin: false, trust_level: 3 });
+test("regular user - sufficient trust level", (assert) => {
+  replaceCurrentUser({ staff: false, trust_level: 3 });
 
   displayPollBuilderButton();
 
@@ -20,8 +20,8 @@ test("sufficient trust level", (assert) => {
   });
 });
 
-test("insufficient trust level", (assert) => {
-  replaceCurrentUser({ admin: false, trust_level: 1 });
+test("regular user - insufficient trust level", (assert) => {
+  replaceCurrentUser({ staff: false, trust_level: 1 });
 
   displayPollBuilderButton();
 
@@ -30,8 +30,8 @@ test("insufficient trust level", (assert) => {
   });
 });
 
-test("admin", (assert) => {
-  replaceCurrentUser({ admin: true });
+test("staff", (assert) => {
+  replaceCurrentUser({ staff: true });
 
   displayPollBuilderButton();
 

plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6

@@ -6,13 +6,12 @@ acceptance("Poll Builder - polls are enabled", {
   loggedIn: true,
   settings: {
     poll_enabled: true,
-    poll_allow_staff_to_create: false,
     poll_minimum_trust_level_to_create: 1
   }
 });
 
-test("sufficient trust level", (assert) => {
-  replaceCurrentUser({ admin: false, trust_level: 1 });
+test("regular user - sufficient trust level", (assert) => {
+  replaceCurrentUser({ staff: false, trust_level: 1 });
 
   displayPollBuilderButton();
 
@@ -21,8 +20,8 @@ test("sufficient trust level", (assert) => {
   });
 });
 
-test("insufficient trust level", (assert) => {
-  replaceCurrentUser({ admin: false, trust_level: 0 });
+test("regular user - insufficient trust level", (assert) => {
+  replaceCurrentUser({ staff: false, trust_level: 0 });
 
   displayPollBuilderButton();
 
@@ -31,19 +30,8 @@ test("insufficient trust level", (assert) => {
   });
 });
 
-test("staff with insufficient trust level", (assert) => {
-  replaceCurrentUser({ admin: false, staff: true, trust_level: 0 });
-
-  displayPollBuilderButton();
-
-  andThen(() => {
-    assert.ok(!exists("button[title='Build Poll']"), "it hides the builder button");
-  });
-});
-
-
-test("admin with insufficient trust level", (assert) => {
-  replaceCurrentUser({ admin: true, trust_level: 0 });
+test("staff - with insufficient trust level", (assert) => {
+  replaceCurrentUser({ staff: true, trust_level: 0 });
 
   displayPollBuilderButton();