From 8f445e835b2790af147afb7cdeba46399665f8b3 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 22 May 2014 09:08:09 +1000 Subject: [PATCH] FIX broken spec --- spec/models/user_spec.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 4057ede3f3a..af8cb541b07 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -144,7 +144,7 @@ describe User do describe 'allow custom minimum username length from site settings' do before do @custom_min = User::GLOBAL_USERNAME_LENGTH_RANGE.begin - 1 - SiteSetting.stubs("min_username_length").returns(@custom_min) + SiteSetting.min_username_length = @custom_min end it 'should allow a shorter username than default' do @@ -158,15 +158,13 @@ describe User do end 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 end it 'should use default length for validation if enforce_global_nicknames is true' do - SiteSetting.stubs('enforce_global_nicknames').returns(true) - - User::username_length.begin.should == User::GLOBAL_USERNAME_LENGTH_RANGE.begin - User::username_length.end.should == User::GLOBAL_USERNAME_LENGTH_RANGE.end + SiteSetting.enforce_global_nicknames = true + User::username_length.should == User::GLOBAL_USERNAME_LENGTH_RANGE end end end