Fix specs for Rails 5.2.
This commit is contained in:
parent
a530f785d3
commit
2da69df8c9
|
@ -6,13 +6,15 @@ describe TopicQuery do
|
||||||
let(:user2) { Fabricate(:user) }
|
let(:user2) { Fabricate(:user) }
|
||||||
|
|
||||||
let(:user_topic) do
|
let(:user_topic) do
|
||||||
Fabricate(:private_message_topic,
|
topic = Fabricate(:private_message_topic,
|
||||||
topic_allowed_users: [
|
topic_allowed_users: [
|
||||||
Fabricate.build(:topic_allowed_user, user: user),
|
Fabricate.build(:topic_allowed_user, user: user),
|
||||||
Fabricate.build(:topic_allowed_user, user: user2)
|
Fabricate.build(:topic_allowed_user, user: user2)
|
||||||
],
|
],
|
||||||
posts: [Fabricate(:post)]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
topic.posts << Fabricate(:post)
|
||||||
|
topic
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:assigned_topic) do
|
let(:assigned_topic) do
|
||||||
|
@ -21,9 +23,9 @@ describe TopicQuery do
|
||||||
Fabricate.build(:topic_allowed_user, user: user),
|
Fabricate.build(:topic_allowed_user, user: user),
|
||||||
Fabricate.build(:topic_allowed_user, user: user2)
|
Fabricate.build(:topic_allowed_user, user: user2)
|
||||||
],
|
],
|
||||||
posts: [Fabricate(:post)]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
topic.posts << Fabricate(:post)
|
||||||
TopicAssigner.new(topic, user).assign(user)
|
TopicAssigner.new(topic, user).assign(user)
|
||||||
topic
|
topic
|
||||||
end
|
end
|
||||||
|
@ -38,9 +40,9 @@ describe TopicQuery do
|
||||||
Fabricate.build(:topic_allowed_group, group: group),
|
Fabricate.build(:topic_allowed_group, group: group),
|
||||||
Fabricate.build(:topic_allowed_group, group: group2)
|
Fabricate.build(:topic_allowed_group, group: group2)
|
||||||
],
|
],
|
||||||
posts: [Fabricate(:post)]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
topic.posts << Fabricate(:post)
|
||||||
TopicAssigner.new(topic, user).assign(user)
|
TopicAssigner.new(topic, user).assign(user)
|
||||||
topic
|
topic
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,22 +4,24 @@ RSpec.describe TopicListSerializer do
|
||||||
let(:user) { Fabricate(:user) }
|
let(:user) { Fabricate(:user) }
|
||||||
|
|
||||||
let(:private_message_topic) do
|
let(:private_message_topic) do
|
||||||
Fabricate(:private_message_topic,
|
topic = Fabricate(:private_message_topic,
|
||||||
posts: [Fabricate(:post)],
|
|
||||||
topic_allowed_users: [
|
topic_allowed_users: [
|
||||||
Fabricate.build(:topic_allowed_user, user: user)
|
Fabricate.build(:topic_allowed_user, user: user)
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
topic.posts << Fabricate(:post)
|
||||||
|
topic
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:assigned_topic) do
|
let(:assigned_topic) do
|
||||||
topic = Fabricate(:private_message_topic,
|
topic = Fabricate(:private_message_topic,
|
||||||
posts: [Fabricate(:post)],
|
|
||||||
topic_allowed_users: [
|
topic_allowed_users: [
|
||||||
Fabricate.build(:topic_allowed_user, user: user)
|
Fabricate.build(:topic_allowed_user, user: user)
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
topic.posts << Fabricate(:post)
|
||||||
|
|
||||||
TopicAssigner.new(topic, user).assign(user)
|
TopicAssigner.new(topic, user).assign(user)
|
||||||
topic
|
topic
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue