mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FEATURE: Improving bookmarks part 2 -- Topic Bookmarking (#8954)
### UI Changes If `SiteSetting.enable_bookmarks_with_reminders` is enabled: * Clicking "Bookmark" on a topic will create a new Bookmark record instead of a post + user action * Clicking "Clear Bookmarks" on a topic will delete all the new Bookmark records on a topic * The topic bookmark buttons control the post bookmark flags correctly and vice-versa Disabled selecting the "reminder type" for bookmarks in the UI because the backend functionality is not done yet (of sending users notifications etc.) ### Other Changes * Added delete bookmark route (but no UI yet) * Added a rake task to sync the old PostAction bookmarks to the new Bookmark table, which can be run as many times as we want for a site (it will not create duplicates).
This commit is contained in:
@@ -5,6 +5,7 @@ require 'rails_helper'
|
||||
describe BookmarksController do
|
||||
let(:current_user) { Fabricate(:user) }
|
||||
let(:bookmark_post) { Fabricate(:post) }
|
||||
let(:bookmark_user) { current_user }
|
||||
|
||||
before do
|
||||
sign_in(current_user)
|
||||
@@ -13,7 +14,7 @@ describe BookmarksController do
|
||||
describe "#create" do
|
||||
context "if the user already has bookmarked the post" do
|
||||
before do
|
||||
Fabricate(:bookmark, post: bookmark_post, user: current_user)
|
||||
Fabricate(:bookmark, post: bookmark_post, user: bookmark_user)
|
||||
end
|
||||
|
||||
it "returns failed JSON with a 422 error" do
|
||||
@@ -44,4 +45,38 @@ describe BookmarksController do
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe "#destroy" do
|
||||
let!(:bookmark) { Fabricate(:bookmark, post: bookmark_post, user: bookmark_user) }
|
||||
|
||||
it "destroys the bookmark" do
|
||||
delete "/bookmarks/#{bookmark.id}.json"
|
||||
expect(Bookmark.find_by(id: bookmark.id)).to eq(nil)
|
||||
end
|
||||
|
||||
context "if the bookmark has already been destroyed" do
|
||||
it "returns failed JSON with a 403 error" do
|
||||
bookmark.destroy!
|
||||
delete "/bookmarks/#{bookmark.id}.json"
|
||||
|
||||
expect(response.status).to eq(404)
|
||||
expect(JSON.parse(response.body)['errors'].first).to include(
|
||||
I18n.t("not_found")
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
context "if the bookmark does not belong to the user" do
|
||||
let(:bookmark_user) { Fabricate(:user) }
|
||||
|
||||
it "returns failed JSON with a 403 error" do
|
||||
delete "/bookmarks/#{bookmark.id}.json"
|
||||
|
||||
expect(response.status).to eq(403)
|
||||
expect(JSON.parse(response.body)['errors'].first).to include(
|
||||
I18n.t("invalid_access")
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user