remove unused deletion code from user

This commit is contained in:
r888888888
2013-05-20 17:50:13 -07:00
parent 0d22bbd169
commit e510e4d35f
4 changed files with 8 additions and 61 deletions

View File

@@ -655,35 +655,6 @@ class User < ActiveRecord::Base
end
end
module DeletionMethods
def delete!
scramble_password
remove_all_favorites
rename_for_delete
end
def rename_for_delete
alt_name = "user#{id}"
n = 0
while User.where(:name => alt_name).exists?
alt_name = "user#{id}_#{n}"
n += 1
end
update_attribute(:name, alt_name)
end
def scramble_password
update_attribute(:bcrypt_password_hash, User.bcrypt(SecureRandom.hex(16)))
end
def remove_all_favorites
Post.tag_match("fav:#{name}").find_each do |post|
Favorite.remove(post, self)
end
end
end
include BanMethods
include NameMethods
include PasswordMethods
@@ -698,7 +669,6 @@ class User < ActiveRecord::Base
include ApiMethods
include CountMethods
extend SearchMethods
include DeletionMethods
def initialize_default_image_size
self.default_image_size = "large"

View File

@@ -2,10 +2,10 @@ FactoryGirl.define do
factory(:note) do
creator :factory => :user
post
x 0
y 0
width 0
height 0
x 1
y 1
width 1
height 1
is_active true
body {Faker::Lorem.sentences.join(" ")}
updater_id :factory => :user

View File

@@ -132,9 +132,9 @@ class NoteTest < ActiveSupport::TestCase
context "when notes have been vandalized by one user" do
setup do
@vandal = FactoryGirl.create(:user)
@note = FactoryGirl.create(:note, :x => 100, :y => 100)
@note = FactoryGirl.create(:note, :x => 5, :y => 5)
CurrentUser.scoped(@vandal, "127.0.0.1") do
@note.update_attributes(:x => 2000, :y => 2000)
@note.update_attributes(:x => 10, :y => 10)
end
end
@@ -142,8 +142,8 @@ class NoteTest < ActiveSupport::TestCase
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)
assert_equal(5, @note.x)
assert_equal(5, @note.y)
end
end
end

View File

@@ -14,29 +14,6 @@ class UserTest < ActiveSupport::TestCase
CurrentUser.ip_addr = nil
end
context "that has been deleted" do
setup do
@post = FactoryGirl.create(:post)
Favorite.add(@post, @user)
@user.delete!
@post.reload
end
should "rename the user" do
assert_equal("user#{@user.id}", @user.name)
end
should "remove all favorites" do
assert_equal(0, @user.favorite_count)
assert_equal(0, Favorite.for_user(@user.id).count)
assert_equal("", @post.fav_string)
end
should "reset the password" do
assert_nil(User.authenticate(@user.name, "password"))
end
end
context "favoriting a post" do
setup do
@user.update_column(:favorite_count, 999)