mirror of
https://github.com/discourse/discourse.git
synced 2025-05-21 18:12:32 +08:00
FEATURE: Promote bookmarks with reminders to core functionality (#9369)
The main thrust of this PR is to take all the conditional checks based on the `enable_bookmarks_with_reminders` away and only keep the code from the `true` path, making bookmarks with reminders the core bookmarks feature. There is also a migration to create `Bookmark` records out of `PostAction` bookmarks for a site. ### Summary * Remove logic based on whether enable_bookmarks_with_reminders is true. This site setting is now obsolete, the old bookmark functionality is being removed. Retain the setting and set the value to `true` in a migration. * Use the code from the rake task to create a database migration that creates bookmarks from post actions. * Change the bookmark report to read from the new table. * Get rid of old endpoints for bookmarks * Link to the new bookmarks list from the user summary page
This commit is contained in:
@ -482,131 +482,6 @@ describe PostsController do
|
||||
end
|
||||
end
|
||||
|
||||
describe '#bookmark' do
|
||||
include_examples 'action requires login', :put, "/posts/2/bookmark.json"
|
||||
let!(:post) { post_by_user }
|
||||
|
||||
describe 'when logged in' do
|
||||
before do
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
fab!(:private_message) { Fabricate(:private_message_post) }
|
||||
|
||||
it "raises an error if the user doesn't have permission to see the post" do
|
||||
put "/posts/#{private_message.id}/bookmark.json", params: { bookmarked: "true" }
|
||||
expect(response).to be_forbidden
|
||||
end
|
||||
|
||||
it 'creates a bookmark' do
|
||||
put "/posts/#{post.id}/bookmark.json", params: { bookmarked: "true" }
|
||||
expect(response.status).to eq(200)
|
||||
|
||||
post_action = PostAction.find_by(user: user, post: post)
|
||||
expect(post_action.post_action_type_id).to eq(PostActionType.types[:bookmark])
|
||||
end
|
||||
|
||||
context "removing a bookmark" do
|
||||
let(:post_action) { PostActionCreator.create(user, post, :bookmark).post_action }
|
||||
|
||||
it "returns the right response when post is not bookmarked" do
|
||||
put "/posts/#{post_by_user.id}/bookmark.json"
|
||||
expect(response.status).to eq(404)
|
||||
end
|
||||
|
||||
it "should be able to remove a bookmark" do
|
||||
post_action
|
||||
put "/posts/#{post.id}/bookmark.json"
|
||||
|
||||
expect(PostAction.find_by(id: post_action.id)).to eq(nil)
|
||||
end
|
||||
|
||||
describe "when user doesn't have permission to see bookmarked post" do
|
||||
it "should still be able to remove a bookmark" do
|
||||
post_action
|
||||
post = post_action.post
|
||||
topic = post.topic
|
||||
topic.convert_to_private_message(admin)
|
||||
topic.remove_allowed_user(admin, user.username)
|
||||
|
||||
expect(Guardian.new(user).can_see_post?(post.reload)).to eq(false)
|
||||
|
||||
put "/posts/#{post.id}/bookmark.json"
|
||||
|
||||
expect(PostAction.find_by(id: post_action.id)).to eq(nil)
|
||||
end
|
||||
end
|
||||
|
||||
describe "when post has been deleted" do
|
||||
it "should still be able to remove a bookmark" do
|
||||
post = post_action.post
|
||||
post.trash!
|
||||
|
||||
put "/posts/#{post.id}/bookmark.json"
|
||||
|
||||
expect(PostAction.find_by(id: post_action.id)).to eq(nil)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "api" do
|
||||
let(:api_key) { Fabricate(:api_key, user: user) }
|
||||
let(:master_key) { Fabricate(:api_key, user: nil) }
|
||||
|
||||
# choosing an arbitrarily easy to mock trusted activity
|
||||
it 'allows users with api key to bookmark posts' do
|
||||
put "/posts/#{post.id}/bookmark.json",
|
||||
params: { bookmarked: "true" },
|
||||
headers: { HTTP_API_KEY: api_key.key }
|
||||
|
||||
expect(response.status).to eq(200)
|
||||
expect(PostAction.where(
|
||||
post: post,
|
||||
user: user,
|
||||
post_action_type_id: PostActionType.types[:bookmark]
|
||||
).count).to eq(1)
|
||||
end
|
||||
|
||||
it 'raises an error with a user key that does not match an optionally specified username' do
|
||||
put "/posts/#{post.id}/bookmark.json",
|
||||
params: { bookmarked: "true" },
|
||||
headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: 'made_up' }
|
||||
|
||||
expect(response.status).to eq(403)
|
||||
end
|
||||
|
||||
it 'allows users with a master api key to bookmark posts' do
|
||||
put "/posts/#{post.id}/bookmark.json",
|
||||
params: { bookmarked: "true" },
|
||||
headers: { HTTP_API_KEY: master_key.key, HTTP_API_USERNAME: user.username }
|
||||
|
||||
expect(response.status).to eq(200)
|
||||
expect(PostAction.where(
|
||||
post: post,
|
||||
user: user,
|
||||
post_action_type_id: PostActionType.types[:bookmark]
|
||||
).count).to eq(1)
|
||||
end
|
||||
|
||||
it 'disallows phonies to bookmark posts' do
|
||||
put "/posts/#{post.id}/bookmark.json",
|
||||
params: { bookmarked: "true" },
|
||||
headers: { HTTP_API_KEY: SecureRandom.hex(32), HTTP_API_USERNAME: user.username }
|
||||
|
||||
expect(response.status).to eq(403)
|
||||
end
|
||||
|
||||
it 'disallows blank api' do
|
||||
put "/posts/#{post.id}/bookmark.json",
|
||||
params: { bookmarked: "true" },
|
||||
headers: { HTTP_API_KEY: "", HTTP_API_USERNAME: user.username }
|
||||
|
||||
expect(response.status).to eq(403)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '#wiki' do
|
||||
include_examples "action requires login", :put, "/posts/2/wiki.json"
|
||||
|
||||
|
Reference in New Issue
Block a user