+
{{#if showAdvanced}} {{d-icon "caret-down"}} {{i18n "user.invited.invite.hide_advanced"}} {{else}} @@ -108,7 +108,7 @@ {{d-button icon="link" label="user.invited.invite.save_invite" - class="btn-primary" + class="btn-primary save-invite" action=(action "saveInvite") disabled=disabled }} @@ -117,7 +117,7 @@ {{d-button icon="envelope" label=(if invite.emailed "user.invited.reinvite" "user.invited.invite.send_invite_email") - class="btn-primary" + class="btn-primary send-invite" action=(action "saveInvite" true) disabled=disabled }} diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js new file mode 100644 index 00000000000..07fd2fc2623 --- /dev/null +++ b/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js @@ -0,0 +1,183 @@ +import { click, fillIn, visit } from "@ember/test-helpers"; +import { acceptance } from "discourse/tests/helpers/qunit-helpers"; +import { test } from "qunit"; + +acceptance("Invites - Create & Edit Invite Modal", function (needs) { + let deleted; + + needs.user(); + needs.pretender((server, helper) => { + const inviteData = { + id: 1, + invite_key: "52641ae8878790bc7b79916247cfe6ba", + link: "http://example.com/invites/52641ae8878790bc7b79916247cfe6ba", + max_redemptions_allowed: 1, + redemption_count: 0, + created_at: "2021-01-26T12:00:00.000Z", + updated_at: "2021-01-26T12:00:00.000Z", + expires_at: "2121-01-26T12:00:00.000Z", + expired: false, + topics: [], + groups: [], + }; + + server.post("/invites", () => helper.response(inviteData)); + server.put("/invites/1", () => helper.response(inviteData)); + + server.delete("/invites", () => { + deleted = true; + return helper.response({}); + }); + }); + needs.hooks.beforeEach(() => { + deleted = false; + }); + + test("basic functionality", async function (assert) { + await visit("/u/eviltrout/invited/pending"); + await click(".invite-controls .btn:first-child"); + assert.equal( + find("input.invite-link")[0].value, + "http://example.com/invites/52641ae8878790bc7b79916247cfe6ba", + "shows an invite link when modal is opened" + ); + + await click("#invite-show-advanced a"); + await assert.ok( + find(".invite-to-groups").length > 0, + "shows advanced options" + ); + await assert.ok( + find(".invite-to-topic").length > 0, + "shows advanced options" + ); + await assert.ok( + find(".invite-expires-at").length > 0, + "shows advanced options" + ); + + await click(".modal-footer .btn:last-child"); + assert.ok(deleted, "deletes the invite if not saved"); + }); + + test("saving", async function (assert) { + await visit("/u/eviltrout/invited/pending"); + await click(".invite-controls .btn:first-child"); + + assert.ok( + find("tbody tr").length === 0, + "does not show invite before saving" + ); + + await click(".btn-primary"); + + assert.ok( + find("tbody tr").length === 1, + "adds invite to list after saving" + ); + + await click(".modal-footer .btn:last-child"); + assert.notOk(deleted, "does not delete invite on close"); + }); + + test("copying saves invite", async function (assert) { + await visit("/u/eviltrout/invited/pending"); + await click(".invite-controls .btn:first-child"); + + await click(".invite-link-field .btn"); + + await click(".modal-footer .btn:last-child"); + assert.notOk(deleted, "does not delete invite on close"); + }); +}); + +acceptance("Invites - Link Invites", function (needs) { + needs.user(); + needs.pretender((server, helper) => { + const inviteData = { + id: 1, + invite_key: "52641ae8878790bc7b79916247cfe6ba", + link: "http://example.com/invites/52641ae8878790bc7b79916247cfe6ba", + max_redemptions_allowed: 1, + redemption_count: 0, + created_at: "2021-01-26T12:00:00.000Z", + updated_at: "2021-01-26T12:00:00.000Z", + expires_at: "2121-01-26T12:00:00.000Z", + expired: false, + topics: [], + groups: [], + }; + + server.post("/invites", () => helper.response(inviteData)); + server.put("/invites/1", () => helper.response(inviteData)); + server.delete("/invites", () => helper.response({})); + }); + + test("invite links", async function (assert) { + await visit("/u/eviltrout/invited/pending"); + await click(".invite-controls .btn:first-child"); + + await click("#invite-type-link"); + assert.ok( + find("#invite-max-redemptions").length, + "shows max redemptions field" + ); + }); +}); + +acceptance("Invites - Email Invites", function (needs) { + let lastRequest; + + needs.user(); + needs.pretender((server, helper) => { + const inviteData = { + id: 1, + invite_key: "52641ae8878790bc7b79916247cfe6ba", + link: "http://example.com/invites/52641ae8878790bc7b79916247cfe6ba", + email: "test@example.com", + emailed: false, + custom_message: null, + created_at: "2021-01-26T12:00:00.000Z", + updated_at: "2021-01-26T12:00:00.000Z", + expires_at: "2121-01-26T12:00:00.000Z", + expired: false, + topics: [], + groups: [], + }; + + server.post("/invites", () => helper.response(inviteData)); + + server.put("/invites/1", (request) => { + lastRequest = request; + return helper.response(inviteData); + }); + }); + needs.hooks.beforeEach(() => { + lastRequest = null; + }); + + test("invite email", async function (assert) { + await visit("/u/eviltrout/invited/pending"); + await click(".invite-controls .btn:first-child"); + + await click("#invite-type-email"); + + assert.ok(find("#invite-email").length, "shows email field"); + + await fillIn("#invite-email", "test@example.com"); + assert.ok(find(".save-invite").length, "shows save without email button"); + await click(".save-invite"); + assert.ok( + lastRequest.requestBody.indexOf("skip_email=true") !== -1, + "sends skip_email to server" + ); + + await fillIn("#invite-email", "test2@example.com"); + assert.ok(find(".send-invite").length, "shows save and send email button"); + await click(".send-invite"); + assert.ok( + lastRequest.requestBody.indexOf("send_email=true") !== -1, + "sends send_email to server" + ); + }); +}); diff --git a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js index 419443e8325..aa627d6eed2 100644 --- a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js +++ b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js @@ -189,7 +189,16 @@ export function applyDefaultHandlers(pretender) { }); pretender.get("/u/eviltrout/invited.json", () => { - return response({ invites: [{ id: 1 }] }); + return response({ + invites: [], + can_see_invite_details: true, + counts: { + pending: 0, + expired: 0, + redeemed: 0, + total: 0, + }, + }); }); pretender.get("/topics/private-messages/eviltrout.json", () => {