jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed unit tests

Browse Source
This commit is contained in:
albert
2011-01-22 03:01:15 -05:00
parent 6824e98af3
commit c5a9067e72
6 changed files with 157 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/forum_post.rb
View File

@@ -14,7 +14,8 @@ class ForumPost < ActiveRecord::Base
end
def update_topic_updated_at
topic.update_attributes(:updater_id => CurrentUser.id)
topic.update_attribute(:updater_id, CurrentUser.id)
topic.touch
end
def initialize_creator

19
app/models/note.rb
View File

@@ -13,7 +13,7 @@ class Note < ActiveRecord::Base
validate :post_must_not_be_note_locked
attr_accessible :x, :y, :width, :height, :body, :updater_id, :updater_ip_addr, :is_active, :post_id
scope :active, where("is_active = TRUE")
scope :body_matches, lambda {|query| where("text_index @@ plainto_tsquery(?)", query)}
scope :body_matches, lambda {|query| where("text_index @@ plainto_tsquery(?)", query.scan(/\S+/).join(" & "))}
search_method :body_matches
def presenter
@@ -97,21 +97,4 @@ class Note < ActiveRecord::Base
end
end
end
def self.build_relation(params)
relation = where("TRUE")
if !params[:query].blank?
query = params[:query].scan(/\S+/).join(" & ")
relation = relation.where(["text_index @@ plainto_tsquery(?)", query])
end
if params[:status] == "Active"
relation = relation.where("is_active = TRUE")
elsif params[:status] == "Deleted"
relation = relation.where("is_active = FALSE")
end
relation
end
end

56
test/unit/ban_test.rb
View File

@@ -5,10 +5,14 @@ class BanTest < ActiveSupport::TestCase
context "created by an admin" do
setup do
@banner = Factory.create(:admin_user)
CurrentUser.user = @banner
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
@banner = nil
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
should "not be valid against another admin" do
@@ -44,10 +48,14 @@ class BanTest < ActiveSupport::TestCase
context "created by a moderator" do
setup do
@banner = Factory.create(:moderator_user)
CurrentUser.user = @banner
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
@banner = nil
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
should "not be valid against an admin or moderator" do
@@ -84,10 +92,14 @@ class BanTest < ActiveSupport::TestCase
context "created by a janitor" do
setup do
@banner = Factory.create(:janitor_user)
CurrentUser.user = @banner
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
@banner = nil
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
should "always be invalid" do
@@ -126,7 +138,9 @@ class BanTest < ActiveSupport::TestCase
should "initialize the expiration date" do
user = Factory.create(:user)
admin = Factory.create(:admin_user)
CurrentUser.user = admin
ban = Factory.create(:ban, :user => user, :banner => admin)
CurrentUser.user = nil
assert_not_nil(ban.expires_at)
end
@@ -134,7 +148,9 @@ class BanTest < ActiveSupport::TestCase
user = Factory.create(:user)
admin = Factory.create(:admin_user)
assert(user.feedback.empty?)
CurrentUser.user = admin
ban = Factory.create(:ban, :user => user, :banner => admin)
CurrentUser.user = nil
assert(!user.feedback.empty?)
assert(!user.feedback.last.is_positive?)
end
@@ -142,16 +158,36 @@ class BanTest < ActiveSupport::TestCase
context "Searching for a ban" do
context "by user id" do
should "not return expired bans" do
admin = Factory.create(:admin_user)
user = Factory.create(:user)
ban = Factory.create(:ban, :user => user, :banner => admin, :duration => -1)
assert(!Ban.is_banned?(user))
user = Factory.create(:user)
ban = Factory.create(:ban, :user => user, :banner => admin, :duration => 1)
assert(Ban.is_banned?(user))
setup do
@admin = Factory.create(:admin_user)
CurrentUser.user = @admin
CurrentUser.ip_addr = "127.0.0.1"
@user = Factory.create(:user)
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "when only expired bans exist" do
setup do
@ban = Factory.create(:ban, :user => @user, :banner => @admin, :duration => -1)
end
should "not return expired bans" do
assert(!Ban.is_banned?(@user))
end
end
context "when active bans still exist" do
setup do
@ban = Factory.create(:ban, :user => @user, :banner => @admin, :duration => 1)
end
should "return active bans" do
assert(Ban.is_banned?(@user))
end
end
end
end

3
test/unit/forum_post_test.rb
View File

@@ -16,9 +16,10 @@ class ForumPostTest < ActiveSupport::TestCase
should "update its parent when saved" do
sleep 1
original_topic_updated_at = @topic.updated_at
post = Factory.create(:forum_post, :topic_id => @topic.id)
@topic.reload
assert(@topic.updated_at > 1.second.ago)
assert_not_equal(original_topic_updated_at, @topic.updated_at)
end
should "be searchable by body content" do

171
test/unit/note_test.rb
View File

@@ -1,84 +1,123 @@
require_relative '../test_helper'
class NoteTest < ActiveSupport::TestCase
setup do
user = Factory.create(:user)
CurrentUser.user = user
CurrentUser.ip_addr = "127.0.0.1"
MEMCACHE.flush_all
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "A note" do
context "In all cases" do
setup do
@user = Factory.create(:user)
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
MEMCACHE.flush_all
end
should "create versions" do
note = nil
assert_difference("NoteVersion.count") do
note = Factory.create(:note)
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "creating a note" do
setup do
@post = Factory.create(:post)
end
version = NoteVersion.last
assert_equal(note.body, version.body)
assert_difference("NoteVersion.count") do
note.update_attributes(:updater_id => note.creator_id, :updater_ip_addr => "127.0.0.1", :body => "fafafa")
should "create a version" do
assert_difference("NoteVersion.count", 1) do
@note = Factory.create(:note, :post => @post)
end
assert_equal(1, @note.versions.count)
assert_equal(@note.body, @note.versions.first.body)
end
version = NoteVersion.last
assert_equal("fafafa", version.body)
end
should "allow undoing any change from a user" do
vandal = Factory.create(:user)
reverter = Factory.create(:user)
note = Factory.create(:note, :x => 100, :y => 100)
note.update_attributes(:x => 2000, :y => 2000, :updater_id => vandal.id, :updater_ip_addr => "127.0.0.1")
note.reload
assert_equal(2000, note.x)
assert_equal(2000, note.y)
Note.undo_changes_by_user(vandal.id, reverter.id, "127.0.0.1")
note.reload
assert_equal(100, note.x)
assert_equal(100, note.y)
end
should "not validate if the post is note locked" do
post = Factory.create(:post, :is_note_locked => true)
note = Factory.build(:note, :post => post)
assert_difference("Note.count", 0) do
note.save
should "update the post's last_noted_at field" do
assert_nil(@post.last_noted_at)
@note = Factory.create(:note, :post => @post)
@post.reload
assert_not_nil(@post.last_noted_at)
end
context "for a note-locked post" do
setup do
@post.update_attribute(:is_note_locked, true)
end
should "fail" do
assert_difference("Note.count", 0) do
@note = Factory.build(:note, :post => @post)
@note.save
end
assert_equal(["Post is note locked"], @note.errors.full_messages)
end
end
assert(note.errors.any?)
end
should "update the post when saved" do
post = Factory.create(:post)
assert_nil(post.last_noted_at)
note = Factory.create(:note, :post => post)
post.reload
assert_not_nil(post.last_noted_at)
context "updating a note" do
setup do
@post = Factory.create(:post)
@note = Factory.create(:note, :post => @post)
end
should "update the post's last_noted_at field" do
assert_nil(@post.last_noted_at)
@note.update_attributes(:x => 1000)
@post.reload
assert_equal(@post.last_noted_at, @note.updated_at)
end
should "create a version" do
assert_difference("NoteVersion.count", 1) do
@note.update_attributes(:body => "fafafa")
end
assert_equal(2, @note.versions.count)
assert_equal("fafafa", @note.versions.last.body)
end
context "for a note-locked post" do
setup do
@post.update_attribute(:is_note_locked, true)
end
should "fail" do
@note.update_attributes(:x => 1000)
assert_equal(["Post is note locked"], @note.errors.full_messages)
end
end
end
should "know when the post is note locked" do
post = Factory.create(:post, :is_note_locked => true)
note = Factory.build(:note, :post => post)
assert(note.is_locked?)
context "when notes have been vandalized by one user" do
setup do
@vandal = Factory.create(:user)
@note = Factory.create(:note, :x => 100, :y => 100)
CurrentUser.scoped(@vandal, "127.0.0.1") do
@note.update_attributes(:x => 2000, :y => 2000)
end
end
context "the act of undoing all changes by that user" do
should "revert any affected notes" do
Note.undo_changes_by_user(@vandal.id)
@note.reload
assert_equal(100, @note.x)
assert_equal(100, @note.y)
end
end
end
should "return hits when searched" do
notes = []
notes << Factory.create(:note, :body => "aaa bbb ccc")
notes << Factory.create(:note, :body => "bbb ccc ddd", :is_active => false)
notes << Factory.create(:note, :body => "eee")
results = Note.build_relation(:query => "bbb").all
assert_equal(2, results.size)
results = Note.build_relation(:query => "bbb", :status => "Active").all
assert_equal(1, results.size)
assert_equal(notes[0].id, results[0].id)
context "searching for a note" do
setup do
@note = Factory.create(:note, :body => "aaa")
end
context "where the body contains the string 'aaa'" do
should "return a hit" do
assert_equal(1, Note.body_matches("aaa").count)
end
end
context "where the body contains the string 'bbb'" do
should "return no hits" do
assert_equal(0, Note.body_matches("bbb").count)
end
end
end
end
end

5
test/unit/pool_test.rb
View File

@@ -23,13 +23,10 @@ class PoolTest < ActiveSupport::TestCase
user = Factory.create(:user)
assert_equal(1, pool.versions(true).size)
pool.post_ids = "1"
pool.updater_id = user.id
pool.updater_ip_addr = "128.0.0.1"
CurrentUser.ip_addr = "1.2.3.4"
pool.save
assert_equal(2, pool.versions(true).size)
pool.post_ids = "1 2"
pool.updater_id = user.id
pool.updater_ip_addr = "128.0.0.1"
pool.save
assert_equal(2, pool.versions(true).size)
pool.revert_to!(PoolVersion.first)