mirror of
https://github.com/discourse/discourse.git
synced 2024-11-26 03:03:37 +08:00
parent
38e1706b61
commit
a2db8d9439
|
@ -1,21 +0,0 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class FoundUserWithStatusSerializer < FoundUserSerializer
|
||||
include UserStatusMixin
|
||||
|
||||
def initialize(object, options = {})
|
||||
super
|
||||
options[:include_status] = true
|
||||
deprecated
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def deprecated
|
||||
message =
|
||||
"FoundUserWithStatusSerializer is deprecated. " \
|
||||
"Use FoundUserSerializer with the include_status option instead."
|
||||
|
||||
Discourse.deprecate(message, since: "3.3.0.beta1", drop_from: "3.3.0.beta2")
|
||||
end
|
||||
end
|
|
@ -1,46 +0,0 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
RSpec.describe FoundUserWithStatusSerializer do
|
||||
fab!(:user_status)
|
||||
fab!(:user) { Fabricate(:user, user_status: user_status) }
|
||||
let(:serializer) { described_class.new(user, root: false) }
|
||||
|
||||
describe "#status" do
|
||||
it "adds user status when enabled" do
|
||||
SiteSetting.enable_user_status = true
|
||||
|
||||
json = serializer.as_json
|
||||
|
||||
expect(json[:status]).to_not be_nil do |status|
|
||||
expect(status.description).to eq(user_status.description)
|
||||
expect(status.emoji).to eq(user_status.emoji)
|
||||
end
|
||||
end
|
||||
|
||||
it "doesn't add user status when disabled" do
|
||||
SiteSetting.enable_user_status = false
|
||||
json = serializer.as_json
|
||||
expect(json.keys).not_to include :status
|
||||
end
|
||||
|
||||
it "doesn't add expired user status" do
|
||||
SiteSetting.enable_user_status = true
|
||||
|
||||
user.user_status.ends_at = 1.minutes.ago
|
||||
serializer = described_class.new(user, scope: Guardian.new(user), root: false)
|
||||
json = serializer.as_json
|
||||
|
||||
expect(json.keys).not_to include :status
|
||||
end
|
||||
|
||||
it "doesn't return status if user doesn't have it" do
|
||||
SiteSetting.enable_user_status = true
|
||||
|
||||
user.clear_status!
|
||||
user.reload
|
||||
json = serializer.as_json
|
||||
|
||||
expect(json.keys).not_to include :status
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user