DEV: Replace #pluck_first monkey patch with native #pick (#467)
This commit is contained in:
parent
d79fea7e4f
commit
afb54c7c1e
|
@ -318,7 +318,7 @@ after_initialize do
|
||||||
end
|
end
|
||||||
|
|
||||||
user_id = topic_query.guardian.user.id if name == "me"
|
user_id = topic_query.guardian.user.id if name == "me"
|
||||||
user_id ||= User.where(username_lower: name.downcase).pluck_first(:id)
|
user_id ||= User.where(username_lower: name.downcase).pick(:id)
|
||||||
|
|
||||||
if user_id
|
if user_id
|
||||||
next(
|
next(
|
||||||
|
@ -329,7 +329,7 @@ after_initialize do
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
group_id = Group.where(name: name.downcase).pluck_first(:id)
|
group_id = Group.where(name: name.downcase).pick(:id)
|
||||||
|
|
||||||
if group_id
|
if group_id
|
||||||
next(
|
next(
|
||||||
|
|
|
@ -111,15 +111,15 @@ describe "integration tests" do
|
||||||
|
|
||||||
it "assigns topic" do
|
it "assigns topic" do
|
||||||
expect do DiscourseEvent.trigger(:assign_topic, topic, user1, admin) end.to change {
|
expect do DiscourseEvent.trigger(:assign_topic, topic, user1, admin) end.to change {
|
||||||
Assignment.where(topic: topic).pluck_first(:assigned_to_id)
|
Assignment.where(topic: topic).pick(:assigned_to_id)
|
||||||
}.from(nil).to(user1.id)
|
}.from(nil).to(user1.id)
|
||||||
|
|
||||||
expect do DiscourseEvent.trigger(:assign_topic, topic, user2, admin) end.to_not change {
|
expect do DiscourseEvent.trigger(:assign_topic, topic, user2, admin) end.to_not change {
|
||||||
Assignment.where(topic: topic).pluck_first(:assigned_to_id)
|
Assignment.where(topic: topic).pick(:assigned_to_id)
|
||||||
}.from(user1.id)
|
}.from(user1.id)
|
||||||
|
|
||||||
expect do DiscourseEvent.trigger(:assign_topic, topic, user2, admin, true) end.to change {
|
expect do DiscourseEvent.trigger(:assign_topic, topic, user2, admin, true) end.to change {
|
||||||
Assignment.where(topic: topic).pluck_first(:assigned_to_id)
|
Assignment.where(topic: topic).pick(:assigned_to_id)
|
||||||
}.from(user1.id).to(user2.id)
|
}.from(user1.id).to(user2.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue