forked from e621ng/e621ng
added pool/uploader tests to post unit test
This commit is contained in:
parent
72d1ece96a
commit
d388b1b3bd
@ -187,7 +187,7 @@ class Post < ActiveRecord::Base
|
|||||||
if old_tag_string
|
if old_tag_string
|
||||||
# If someone else committed changes to this post before we did,
|
# If someone else committed changes to this post before we did,
|
||||||
# then try to merge the tag changes together.
|
# then try to merge the tag changes together.
|
||||||
current_tags = Tag.scan_tags(tag_string_was)
|
current_tags = tag_array_was()
|
||||||
new_tags = tag_array()
|
new_tags = tag_array()
|
||||||
old_tags = Tag.scan_tags(old_tag_string)
|
old_tags = Tag.scan_tags(old_tag_string)
|
||||||
set_tag_string(((current_tags + new_tags) - old_tags + (current_tags & new_tags)).uniq.join(" "))
|
set_tag_string(((current_tags + new_tags) - old_tags + (current_tags & new_tags)).uniq.join(" "))
|
||||||
@ -451,7 +451,7 @@ class Post < ActiveRecord::Base
|
|||||||
self.pool_string.strip!
|
self.pool_string.strip!
|
||||||
end
|
end
|
||||||
|
|
||||||
def remove_pool(user_id)
|
def remove_pool(pool)
|
||||||
self.pool_string.gsub!(/pool:#{pool.name}\b\s*/, " ")
|
self.pool_string.gsub!(/pool:#{pool.name}\b\s*/, " ")
|
||||||
self.pool_string.strip!
|
self.pool_string.strip!
|
||||||
end
|
end
|
||||||
|
@ -194,6 +194,34 @@ class PostTest < ActiveSupport::TestCase
|
|||||||
assert_equal("", @post.fav_string)
|
assert_equal("", @post.fav_string)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "Pooling a post" do
|
||||||
|
should "work" do
|
||||||
|
post = Factory.create(:post)
|
||||||
|
pool = Factory.create(:pool)
|
||||||
|
post.add_pool(pool)
|
||||||
|
assert_equal("pool:#{pool.name}", post.pool_string)
|
||||||
|
post.remove_pool(pool)
|
||||||
|
assert_equal("", post.pool_string)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "A post's uploader" do
|
||||||
|
should "be defined" do
|
||||||
|
post = Factory.create(:post)
|
||||||
|
user1 = Factory.create(:user)
|
||||||
|
user2 = Factory.create(:user)
|
||||||
|
user3 = Factory.create(:user)
|
||||||
|
|
||||||
|
post.uploader = user1
|
||||||
|
assert_equal("uploader:#{user1.name}", post.uploader_string)
|
||||||
|
|
||||||
|
post.uploader_id = user2.id
|
||||||
|
assert_equal("uploader:#{user2.name}", post.uploader_string)
|
||||||
|
assert_equal(user2.id, post.uploader_id)
|
||||||
|
assert_equal(user2.name, post.uploader_name)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context "A tag search" do
|
context "A tag search" do
|
||||||
should "return posts for 1 tag" do
|
should "return posts for 1 tag" do
|
||||||
|
Loading…
Reference in New Issue
Block a user