github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 10:44:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Pie chart option for poll results (#8352)

Browse Source
This commit is contained in:
Mark VanLandingham
2019-11-25 11:51:01 -06:00
committed by GitHub
parent 720101b3ee
commit b92a8131c0
23 changed files with 947 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
plugins/poll/test/javascripts/acceptance/poll-pie-chart-test.js.es6 Normal file
View File

@ -0,0 +1,128 @@
import { acceptance } from "helpers/qunit-helpers";
import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
import { Promise } from "rsvp";
acceptance("Rendering polls with pie charts - desktop", {
loggedIn: true,
settings: { poll_enabled: true, poll_groupable_user_fields: "something" },
beforeEach() {
clearPopupMenuOptionsCallback();
},
pretend(server, helper) {
server.get("/polls/grouped_poll_results.json", () => {
return new Promise(resolve => {
resolve(
helper.response({
grouped_results: [
{
group: "Engineering",
options: [
{
digest: "687a1ccf3c6a260f9aeeb7f68a1d463c",
html: "This Is",
votes: 1
},
{
digest: "9377906763a1221d31d656ea0c4a4495",
html: "A test for sure",
votes: 1
},
{
digest: "ecf47c65a85a0bb20029072b1b721977",
html: "Why not give it some more",
votes: 1
}
]
},
{
group: "Marketing",
options: [
{
digest: "687a1ccf3c6a260f9aeeb7f68a1d463c",
html: "This Is",
votes: 1
},
{
digest: "9377906763a1221d31d656ea0c4a4495",
html: "A test for sure",
votes: 1
},
{
digest: "ecf47c65a85a0bb20029072b1b721977",
html: "Why not give it some more",
votes: 1
}
]
}
]
})
);
});
});
}
});
test("Polls", async assert => {
await visit("/t/-/topic_with_pie_chart_poll");
const poll = find(".poll")[0];
assert.equal(
find(".info-number", poll)[0].innerHTML,
"2",
"it should display the right number of voters"
);
assert.equal(
find(".info-number", poll)[1].innerHTML,
"5",
"it should display the right number of votes"
);
assert.equal(
poll.classList.contains("pie"),
true,
"pie class is present on poll div"
);
assert.equal(
find(".poll-results-chart", poll).length,
1,
"Renders the chart div instead of bar container"
);
assert.equal(
find(".poll-group-by-toggle").text(),
"Show breakdown",
"Shows the breakdown button when poll_groupable_user_fields is non-empty"
);
await click(".poll-group-by-toggle:first");
assert.equal(
find(".poll-group-by-toggle").text(),
"Hide breakdown",
"Shows the combine breakdown button after toggle is clicked"
);
// Double click to make sure the state toggles back to combined view
await click(".toggle-results:first");
await click(".toggle-results:first");
assert.equal(
find(".poll-group-by-toggle").text(),
"Hide breakdown",
"Returns to the grouped view, after toggling results shown"
);
assert.equal(
find(".poll-grouped-pie-container").length,
2,
"Renders a chart for each of the groups in group_results response"
);
assert.ok(
find(".poll-grouped-pie-container > canvas")[0].$chartjs,
"$chartjs is defined on the pie charts"
);
});

2
plugins/poll/test/javascripts/acceptance/polls-test-desktop.js.es6 → plugins/poll/test/javascripts/acceptance/polls-bar-chart-test-desktop.js.es6
View File

@ -1,7 +1,7 @@
import { acceptance } from "helpers/qunit-helpers";
import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
acceptance("Rendering polls - desktop", {
acceptance("Rendering polls with bar charts - desktop", {
loggedIn: true,
settings: { poll_enabled: true },
beforeEach() {

2
plugins/poll/test/javascripts/acceptance/polls-test-mobile.js.es6 → plugins/poll/test/javascripts/acceptance/polls-bar-chart-test-mobile.js.es6
View File

@ -1,7 +1,7 @@
import { acceptance } from "helpers/qunit-helpers";
import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
acceptance("Rendering polls - mobile", {
acceptance("Rendering polls with bar charts - mobile", {
loggedIn: true,
mobileView: true,
settings: { poll_enabled: true },

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

@ -101,10 +101,7 @@ test("pollMinOptions", function(assert) {
assert.deepEqual(
controller.get("pollMinOptions"),
[
{ name: 1, value: 1 },
{ name: 2, value: 2 }
],
[{ name: 1, value: 1 }, { name: 2, value: 2 }],
"it should return the right options"
);
@ -113,10 +110,7 @@ test("pollMinOptions", function(assert) {
assert.deepEqual(
controller.get("pollMinOptions"),
[
{ name: 1, value: 1 },
{ name: 2, value: 2 }
],
[{ name: 1, value: 1 }, { name: 2, value: 2 }],
"it should return the right options"
);
});
@ -183,11 +177,7 @@ test("pollStepOptions", function(assert) {
assert.deepEqual(
controller.get("pollStepOptions"),
[
{ name: 1, value: 1 },
{ name: 2, value: 2 },
{ name: 3, value: 3 }
],
[{ name: 1, value: 1 }, { name: 2, value: 2 }, { name: 3, value: 3 }],
"it should return the right options"
);
});
@ -272,7 +262,7 @@ test("regular pollOutput", function(assert) {
assert.equal(
controller.get("pollOutput"),
"[poll type=regular]\n* 1\n* 2\n[/poll]\n",
"[poll type=regular chartType=bar]\n* 1\n* 2\n[/poll]\n",
"it should return the right output"
);
@ -280,7 +270,7 @@ test("regular pollOutput", function(assert) {
assert.equal(
controller.get("pollOutput"),
"[poll type=regular public=true]\n* 1\n* 2\n[/poll]\n",
"[poll type=regular public=true chartType=bar]\n* 1\n* 2\n[/poll]\n",
"it should return the right output"
);
});
@ -299,7 +289,7 @@ test("multiple pollOutput", function(assert) {
assert.equal(
controller.get("pollOutput"),
"[poll type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]\n",
"[poll type=multiple min=1 max=2 chartType=bar]\n* 1\n* 2\n[/poll]\n",
"it should return the right output"
);
@ -307,7 +297,7 @@ test("multiple pollOutput", function(assert) {
assert.equal(
controller.get("pollOutput"),
"[poll type=multiple min=1 max=2 public=true]\n* 1\n* 2\n[/poll]\n",
"[poll type=multiple min=1 max=2 public=true chartType=bar]\n* 1\n* 2\n[/poll]\n",
"it should return the right output"
);
});