FIX broken spec

This commit is contained in:
Sam 2014-05-22 09:08:09 +10:00
parent eeef775f21
commit 8f445e835b
1 changed files with 4 additions and 6 deletions

View File

@ -144,7 +144,7 @@ describe User do
describe 'allow custom minimum username length from site settings' do describe 'allow custom minimum username length from site settings' do
before do before do
@custom_min = User::GLOBAL_USERNAME_LENGTH_RANGE.begin - 1 @custom_min = User::GLOBAL_USERNAME_LENGTH_RANGE.begin - 1
SiteSetting.stubs("min_username_length").returns(@custom_min) SiteSetting.min_username_length = @custom_min
end end
it 'should allow a shorter username than default' do it 'should allow a shorter username than default' do
@ -158,15 +158,13 @@ describe User do
end end
it 'should not allow a longer username than limit' do it 'should not allow a longer username than limit' do
result = user.change_username('a' * (User::GLOBAL_USERNAME_LENGTH_RANGE.end + 1)) result = user.change_username('a' * (User.username_length.end + 1))
result.should be_false result.should be_false
end end
it 'should use default length for validation if enforce_global_nicknames is true' do it 'should use default length for validation if enforce_global_nicknames is true' do
SiteSetting.stubs('enforce_global_nicknames').returns(true) SiteSetting.enforce_global_nicknames = true
User::username_length.should == User::GLOBAL_USERNAME_LENGTH_RANGE
User::username_length.begin.should == User::GLOBAL_USERNAME_LENGTH_RANGE.begin
User::username_length.end.should == User::GLOBAL_USERNAME_LENGTH_RANGE.end
end end
end end
end end