FIX: Lots of plugin tests were using old, non-Ember compat CLI APIs (#13320)

plugins/poll/test/javascripts/widgets/discourse-poll-test.js.es6

@@ -1,16 +1,23 @@
 import {
-  moduleForWidget,
-  widgetTest,
-} from "discourse/tests/helpers/widget-test";
+  discourseModule,
+  exists,
+  queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
 import EmberObject from "@ember/object";
 import I18n from "I18n";
-import { count, exists, queryAll } from "discourse/tests/helpers/qunit-helpers";
+import pretender from "discourse/tests/helpers/create-pretender";
 
 let requests = 0;
 
-moduleForWidget("discourse-poll", {
-  pretend(server) {
-    server.put("/polls/vote", () => {
+discourseModule(
+  "Integration | Component | Widget | discourse-poll",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    pretender.put("/polls/vote", () => {
       ++requests;
       return [
         200,
@@ -22,8 +29,16 @@ moduleForWidget("discourse-poll", {
             status: "open",
             results: "always",
             options: [
-              { id: "1f972d1df351de3ce35a787c89faad29", html: "yes", votes: 1 },
-              { id: "d7ebc3a9beea2e680815a1e4f57d6db6", html: "no", votes: 0 },
+              {
+                id: "1f972d1df351de3ce35a787c89faad29",
+                html: "yes",
+                votes: 1,
+              },
+              {
+                id: "d7ebc3a9beea2e680815a1e4f57d6db6",
+                html: "no",
+                votes: 0,
+              },
             ],
             voters: 1,
             chart_type: "bar",
@@ -33,7 +48,7 @@ moduleForWidget("discourse-poll", {
       ];
     });
 
-    server.put("/polls/vote", () => {
+    pretender.put("/polls/vote", () => {
       ++requests;
       return [
         200,
@@ -45,8 +60,16 @@ moduleForWidget("discourse-poll", {
             status: "open",
             results: "always",
             options: [
-              { id: "1f972d1df351de3ce35a787c89faad29", html: "yes", votes: 1 },
-              { id: "d7ebc3a9beea2e680815a1e4f57d6db6", html: "no", votes: 0 },
+              {
+                id: "1f972d1df351de3ce35a787c89faad29",
+                html: "yes",
+                votes: 1,
+              },
+              {
+                id: "d7ebc3a9beea2e680815a1e4f57d6db6",
+                html: "no",
+                votes: 0,
+              },
             ],
             voters: 1,
             chart_type: "bar",
@@ -56,10 +79,8 @@ moduleForWidget("discourse-poll", {
         },
       ];
     });
-  },
-});
 
-const template = `{{mount-widget
+    const template = `{{mount-widget
                     widget="discourse-poll"
                     args=(hash id=id
                                post=post
@@ -67,91 +88,97 @@ const template = `{{mount-widget
                                vote=vote
                                groupableUserFields=groupableUserFields)}}`;
 
-widgetTest("can vote", {
-  template,
+    componentTest("can vote", {
+      template,
 
-  beforeEach() {
-    this.setProperties({
-      post: EmberObject.create({
-        id: 42,
-        topic: {
-          archived: false,
-        },
-      }),
-      poll: EmberObject.create({
-        name: "poll",
-        type: "regular",
-        status: "open",
-        results: "always",
-        options: [
-          { id: "1f972d1df351de3ce35a787c89faad29", html: "yes", votes: 0 },
-          { id: "d7ebc3a9beea2e680815a1e4f57d6db6", html: "no", votes: 0 },
-        ],
-        voters: 0,
-        chart_type: "bar",
-      }),
-      vote: [],
-      groupableUserFields: [],
+      beforeEach() {
+        this.setProperties({
+          post: EmberObject.create({
+            id: 42,
+            topic: {
+              archived: false,
+            },
+          }),
+          poll: EmberObject.create({
+            name: "poll",
+            type: "regular",
+            status: "open",
+            results: "always",
+            options: [
+              { id: "1f972d1df351de3ce35a787c89faad29", html: "yes", votes: 0 },
+              { id: "d7ebc3a9beea2e680815a1e4f57d6db6", html: "no", votes: 0 },
+            ],
+            voters: 0,
+            chart_type: "bar",
+          }),
+          vote: [],
+          groupableUserFields: [],
+        });
+      },
+
+      async test(assert) {
+        requests = 0;
+
+        await click(
+          "li[data-poll-option-id='1f972d1df351de3ce35a787c89faad29']"
+        );
+        assert.equal(requests, 1);
+        assert.equal(count(".chosen"), 1);
+        assert.equal(queryAll(".chosen").text(), "100%yes");
+        assert.equal(queryAll(".toggle-results").text(), "Show vote");
+
+        await click(".toggle-results");
+        assert.equal(
+          queryAll("li[data-poll-option-id='1f972d1df351de3ce35a787c89faad29']")
+            .length,
+          1
+        );
+        assert.equal(queryAll(".toggle-results").text(), "Show results");
+      },
     });
-  },
 
-  async test(assert) {
-    requests = 0;
+    componentTest("cannot vote if not member of the right group", {
+      template,
 
-    await click("li[data-poll-option-id='1f972d1df351de3ce35a787c89faad29']");
-    assert.equal(requests, 1);
-    assert.equal(count(".chosen"), 1);
-    assert.equal(queryAll(".chosen").text(), "100%yes");
-    assert.equal(queryAll(".toggle-results").text(), "Show vote");
+      beforeEach() {
+        this.setProperties({
+          post: EmberObject.create({
+            id: 42,
+            topic: {
+              archived: false,
+            },
+          }),
+          poll: EmberObject.create({
+            name: "poll",
+            type: "regular",
+            status: "open",
+            results: "always",
+            options: [
+              { id: "1f972d1df351de3ce35a787c89faad29", html: "yes", votes: 0 },
+              { id: "d7ebc3a9beea2e680815a1e4f57d6db6", html: "no", votes: 0 },
+            ],
+            voters: 0,
+            chart_type: "bar",
+            groups: "foo",
+          }),
+          vote: [],
+          groupableUserFields: [],
+        });
+      },
 
-    await click(".toggle-results");
-    assert.equal(
-      queryAll("li[data-poll-option-id='1f972d1df351de3ce35a787c89faad29']")
-        .length,
-      1
-    );
-    assert.equal(queryAll(".toggle-results").text(), "Show results");
-  },
-});
+      async test(assert) {
+        requests = 0;
 
-widgetTest("cannot vote if not member of the right group", {
-  template,
-
-  beforeEach() {
-    this.setProperties({
-      post: EmberObject.create({
-        id: 42,
-        topic: {
-          archived: false,
-        },
-      }),
-      poll: EmberObject.create({
-        name: "poll",
-        type: "regular",
-        status: "open",
-        results: "always",
-        options: [
-          { id: "1f972d1df351de3ce35a787c89faad29", html: "yes", votes: 0 },
-          { id: "d7ebc3a9beea2e680815a1e4f57d6db6", html: "no", votes: 0 },
-        ],
-        voters: 0,
-        chart_type: "bar",
-        groups: "foo",
-      }),
-      vote: [],
-      groupableUserFields: [],
+        await click(
+          "li[data-poll-option-id='1f972d1df351de3ce35a787c89faad29']"
+        );
+        assert.equal(
+          queryAll(".poll-container .alert").text(),
+          I18n.t("poll.results.groups.title", { groups: "foo" })
+        );
+        assert.equal(requests, 0);
+        assert.ok(!exists(".chosen"));
+      },
     });
-  },
-
-  async test(assert) {
-    requests = 0;
-
-    await click("li[data-poll-option-id='1f972d1df351de3ce35a787c89faad29']");
-    assert.equal(
-      queryAll(".poll-container .alert").text(),
-      I18n.t("poll.results.groups.title", { groups: "foo" })
-    );
-    assert.equal(requests, 0);
-    assert.ok(!exists(".chosen"));
-  },
-});
+  }
+);