Upgrade rspec to 3.4.0.

This commit is contained in:
Guo Xiang Tan
2016-05-30 11:38:04 +08:00
parent e11c83341c
commit cb5be1fe8f
15 changed files with 40 additions and 44 deletions

View File

@ -613,7 +613,10 @@ class User < ActiveRecord::Base
# Use this helper to determine if the user has a particular trust level.
# Takes into account admin, etc.
def has_trust_level?(level)
raise "Invalid trust level #{level}" unless TrustLevel.valid?(level)
unless TrustLevel.valid?(level)
raise InvalidTrustLevel.new("Invalid trust level #{level}")
end
admin? || moderator? || staged? || TrustLevel.compare(trust_level, level)
end
@ -907,7 +910,7 @@ class User < ActiveRecord::Base
end
def hash_password(password, salt)
raise "password is too long" if password.size > User.max_password_length
raise StandardError.new("password is too long") if password.size > User.max_password_length
Pbkdf2.hash_password(password, salt, Rails.configuration.pbkdf2_iterations, Rails.configuration.pbkdf2_algorithm)
end