Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-15 05:19:21 +0400
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-20 19:54:28 +0400
commit757c7a52916fbee75a94ee453e055e8ce02a428e (patch)
tree45c22e304538bb29b79e129aa1549c3f65208527 /spec
parent19eb63741995e3be60781db74edab5d5ae896c6b (diff)
Fix gravatar and ldap config
Diffstat (limited to 'spec')
-rw-r--r--spec/helpers/application_helper_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index df66e3b48bd..ba1af08421b 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -43,7 +43,7 @@ describe ApplicationHelper do
let(:user_email) { 'user@email.com' }
it "should return a generic avatar path when Gravatar is disabled" do
- Gitlab.config.stub(:disable_gravatar?).and_return(true)
+ Gitlab.config.gravatar.stub(:enabled).and_return(false)
gravatar_icon(user_email).should == 'no_avatar.png'
end
@@ -63,7 +63,7 @@ describe ApplicationHelper do
it "should return custom gravatar path when gravatar_url is set" do
stub!(:request).and_return(double(:ssl? => false))
- Gitlab.config.stub(:gravatar_url).and_return('http://example.local/?s=%{size}&hash=%{hash}')
+ Gitlab.config.gravatar.stub(:plain_url).and_return('http://example.local/?s=%{size}&hash=%{hash}')
gravatar_icon(user_email, 20).should == 'http://example.local/?s=20&hash=b58c6f14d292556214bd64909bcdb118'
end