mirror of
https://github.com/discourse/discourse.git
synced 2024-12-11 18:23:41 +08:00
41b43a2a25
This adds an option to "delete on owner reply" to bookmarks. If you select this option in the modal, then reply to the topic the bookmark is in, the bookmark will be deleted on reply. This PR also changes the checkboxes for these additional bookmark options to an Integer column in the DB with a combobox to select the option you want. The use cases are: * Sometimes I will bookmark the topics to read it later. In this case we definitely don’t need to keep the bookmark after I replied to it. * Sometimes I will read the topic in mobile and I will prefer to reply in PC later. Or I may have to do some research before reply. So I will bookmark it for reply later.
267 lines
7.2 KiB
JavaScript
267 lines
7.2 KiB
JavaScript
import I18n from "I18n";
|
|
import selectKit from "helpers/select-kit-helper";
|
|
import {
|
|
acceptance,
|
|
loggedInUser,
|
|
acceptanceUseFakeClock
|
|
} from "helpers/qunit-helpers";
|
|
import pretender from "helpers/create-pretender";
|
|
import { parsePostData } from "helpers/create-pretender";
|
|
|
|
acceptance("Bookmarking", {
|
|
loggedIn: true,
|
|
afterEach() {
|
|
sandbox.restore();
|
|
}
|
|
});
|
|
|
|
function handleRequest(assert, request) {
|
|
const data = parsePostData(request.requestBody);
|
|
assert.step(data.reminder_type || "none");
|
|
|
|
return [
|
|
200,
|
|
{
|
|
"Content-Type": "application/json"
|
|
},
|
|
{
|
|
id: 999,
|
|
success: "OK"
|
|
}
|
|
];
|
|
}
|
|
|
|
function mockSuccessfulBookmarkPost(assert) {
|
|
pretender.post("/bookmarks", request => handleRequest(assert, request));
|
|
pretender.put("/bookmarks/999", request => handleRequest(assert, request));
|
|
}
|
|
|
|
async function openBookmarkModal() {
|
|
if (exists(".topic-post:first-child button.show-more-actions")) {
|
|
await click(".topic-post:first-child button.show-more-actions");
|
|
}
|
|
|
|
await click(".topic-post:first-child button.bookmark");
|
|
}
|
|
|
|
async function openEditBookmarkModal() {
|
|
await click(".topic-post:first-child button.bookmarked");
|
|
}
|
|
|
|
test("Bookmarks modal opening", async assert => {
|
|
await visit("/t/internationalization-localization/280");
|
|
await openBookmarkModal();
|
|
assert.ok(exists("#bookmark-reminder-modal"), "it shows the bookmark modal");
|
|
});
|
|
|
|
test("Bookmarks modal selecting reminder type", async assert => {
|
|
mockSuccessfulBookmarkPost(assert);
|
|
|
|
await visit("/t/internationalization-localization/280");
|
|
|
|
await openBookmarkModal();
|
|
await click("#tap_tile_tomorrow");
|
|
|
|
await openBookmarkModal();
|
|
await click("#tap_tile_start_of_next_business_week");
|
|
|
|
await openBookmarkModal();
|
|
await click("#tap_tile_next_week");
|
|
|
|
await openBookmarkModal();
|
|
await click("#tap_tile_next_month");
|
|
|
|
await openBookmarkModal();
|
|
await click("#tap_tile_custom");
|
|
assert.ok(exists("#tap_tile_custom.active"), "it selects custom");
|
|
assert.ok(exists(".tap-tile-date-input"), "it shows the custom date input");
|
|
assert.ok(exists(".tap-tile-time-input"), "it shows the custom time input");
|
|
await click("#save-bookmark");
|
|
|
|
assert.verifySteps([
|
|
"tomorrow",
|
|
"start_of_next_business_week",
|
|
"next_week",
|
|
"next_month",
|
|
"custom"
|
|
]);
|
|
});
|
|
|
|
test("Saving a bookmark with a reminder", async assert => {
|
|
mockSuccessfulBookmarkPost(assert);
|
|
await visit("/t/internationalization-localization/280");
|
|
await openBookmarkModal();
|
|
await fillIn("input#bookmark-name", "Check this out later");
|
|
await click("#tap_tile_tomorrow");
|
|
|
|
assert.ok(
|
|
exists(".topic-post:first-child button.bookmark.bookmarked"),
|
|
"it shows the bookmarked icon on the post"
|
|
);
|
|
assert.ok(
|
|
exists(
|
|
".topic-post:first-child button.bookmark.bookmarked > .d-icon-discourse-bookmark-clock"
|
|
),
|
|
"it shows the bookmark clock icon because of the reminder"
|
|
);
|
|
assert.verifySteps(["tomorrow"]);
|
|
});
|
|
|
|
test("Opening the options panel and remembering the option", async assert => {
|
|
mockSuccessfulBookmarkPost(assert);
|
|
await visit("/t/internationalization-localization/280");
|
|
await openBookmarkModal();
|
|
await click(".bookmark-options-button");
|
|
assert.ok(
|
|
exists(".bookmark-options-panel"),
|
|
"it should open the options panel"
|
|
);
|
|
await selectKit(".bookmark-option-selector").expand();
|
|
await selectKit(".bookmark-option-selector").selectRowByValue(1);
|
|
await click("#save-bookmark");
|
|
await openEditBookmarkModal();
|
|
|
|
assert.ok(
|
|
exists(".bookmark-options-panel"),
|
|
"it should reopen the options panel"
|
|
);
|
|
assert.equal(
|
|
selectKit(".bookmark-option-selector")
|
|
.header()
|
|
.value(),
|
|
1
|
|
);
|
|
assert.verifySteps(["none"]);
|
|
});
|
|
|
|
test("Saving a bookmark with no reminder or name", async assert => {
|
|
mockSuccessfulBookmarkPost(assert);
|
|
await visit("/t/internationalization-localization/280");
|
|
await openBookmarkModal();
|
|
await click("#save-bookmark");
|
|
|
|
assert.ok(
|
|
exists(".topic-post:first-child button.bookmark.bookmarked"),
|
|
"it shows the bookmarked icon on the post"
|
|
);
|
|
assert.not(
|
|
exists(
|
|
".topic-post:first-child button.bookmark.bookmarked > .d-icon-discourse-bookmark-clock"
|
|
),
|
|
"it shows the regular bookmark active icon"
|
|
);
|
|
assert.verifySteps(["none"]);
|
|
});
|
|
|
|
test("Deleting a bookmark with a reminder", async assert => {
|
|
pretender.delete("/bookmarks/999", () => [
|
|
200,
|
|
{
|
|
"Content-Type": "application/json"
|
|
},
|
|
{
|
|
success: "OK",
|
|
topic_bookmarked: false
|
|
}
|
|
]);
|
|
|
|
mockSuccessfulBookmarkPost(assert);
|
|
|
|
await visit("/t/internationalization-localization/280");
|
|
await openBookmarkModal();
|
|
await click("#tap_tile_tomorrow");
|
|
|
|
assert.verifySteps(["tomorrow"]);
|
|
|
|
await openEditBookmarkModal();
|
|
|
|
assert.ok(exists("#bookmark-reminder-modal"), "it shows the bookmark modal");
|
|
|
|
await click("#delete-bookmark");
|
|
|
|
assert.ok(exists(".bootbox.modal"), "it asks for delete confirmation");
|
|
assert.ok(
|
|
find(".bootbox.modal")
|
|
.text()
|
|
.includes(I18n.t("bookmarks.confirm_delete")),
|
|
"it shows delete confirmation message"
|
|
);
|
|
|
|
await click(".bootbox.modal .btn-primary");
|
|
|
|
assert.not(
|
|
exists(".topic-post:first-child button.bookmark.bookmarked"),
|
|
"it no longer shows the bookmarked icon on the post after bookmark is deleted"
|
|
);
|
|
});
|
|
|
|
test("Cancelling saving a bookmark", async assert => {
|
|
await visit("/t/internationalization-localization/280");
|
|
await openBookmarkModal();
|
|
await click(".d-modal-cancel");
|
|
assert.not(
|
|
exists(".topic-post:first-child button.bookmark.bookmarked"),
|
|
"it does not show the bookmarked icon on the post because it is not saved"
|
|
);
|
|
});
|
|
|
|
test("Editing a bookmark", async assert => {
|
|
mockSuccessfulBookmarkPost(assert);
|
|
|
|
await visit("/t/internationalization-localization/280");
|
|
let now = moment.tz(loggedInUser().resolvedTimezone(loggedInUser()));
|
|
let tomorrow = now.add(1, "day").format("YYYY-MM-DD");
|
|
await openBookmarkModal();
|
|
await fillIn("input#bookmark-name", "Test name");
|
|
await click("#tap_tile_tomorrow");
|
|
|
|
await openEditBookmarkModal();
|
|
assert.equal(
|
|
find("#bookmark-name").val(),
|
|
"Test name",
|
|
"it should prefill the bookmark name"
|
|
);
|
|
assert.equal(
|
|
find("#bookmark-custom-date > input").val(),
|
|
tomorrow,
|
|
"it should prefill the bookmark date"
|
|
);
|
|
assert.equal(
|
|
find("#bookmark-custom-time").val(),
|
|
"08:00",
|
|
"it should prefill the bookmark time"
|
|
);
|
|
assert.verifySteps(["tomorrow"]);
|
|
});
|
|
|
|
acceptance("Bookmarking - Mobile", {
|
|
loggedIn: true,
|
|
mobileView: true,
|
|
afterEach() {
|
|
sandbox.restore();
|
|
}
|
|
});
|
|
|
|
QUnit.skip(
|
|
"Editing a bookmark that has a Later Today reminder, and it is before 6pm today",
|
|
async assert => {
|
|
await acceptanceUseFakeClock("2020-05-04T13:00:00", async () => {
|
|
mockSuccessfulBookmarkPost(assert);
|
|
await visit("/t/internationalization-localization/280");
|
|
await openBookmarkModal();
|
|
await fillIn("input#bookmark-name", "Test name");
|
|
await click("#tap_tile_later_today");
|
|
await openEditBookmarkModal();
|
|
assert.not(
|
|
exists("#bookmark-custom-date > input"),
|
|
"it does not show the custom date input"
|
|
);
|
|
assert.ok(
|
|
exists("#tap_tile_later_today.active"),
|
|
"it preselects Later Today"
|
|
);
|
|
assert.verifySteps(["later_today"]);
|
|
});
|
|
}
|
|
);
|