summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorskv <skv-headless@yandex.ru>2013-12-14 17:43:48 +0400
committerskv <skv-headless@yandex.ru>2013-12-15 00:05:10 +0400
commitd89527839ea0dd1734dacb71c3ed2a97f1ff74d7 (patch)
tree3fe4c3f961cefb0c06e956bb7906bbc943c90703 /spec/controllers
parentee53b73986ba4c9dd2f0c726a44718acb8febaf8 (diff)
downloadgitlab-ce-d89527839ea0dd1734dacb71c3ed2a97f1ff74d7.tar.gz
fix most of warnings
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/application_controller_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index d528d12c66c..e1c0269b295 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -8,7 +8,7 @@ describe ApplicationController do
it 'should redirect if the user is over their password expiry' do
user.password_expires_at = Time.new(2002)
user.ldap_user?.should be_false
- controller.stub!(:current_user).and_return(user)
+ controller.stub(:current_user).and_return(user)
controller.should_receive(:redirect_to)
controller.should_receive(:new_profile_password_path)
controller.send(:check_password_expiration)
@@ -17,15 +17,15 @@ describe ApplicationController do
it 'should not redirect if the user is under their password expiry' do
user.password_expires_at = Time.now + 20010101
user.ldap_user?.should be_false
- controller.stub!(:current_user).and_return(user)
+ controller.stub(:current_user).and_return(user)
controller.should_not_receive(:redirect_to)
controller.send(:check_password_expiration)
end
it 'should not redirect if the user is over their password expiry but they are an ldap user' do
user.password_expires_at = Time.new(2002)
- user.stub!(:ldap_user?).and_return(true)
- controller.stub!(:current_user).and_return(user)
+ user.stub(:ldap_user?).and_return(true)
+ controller.stub(:current_user).and_return(user)
controller.should_not_receive(:redirect_to)
controller.send(:check_password_expiration)
end