summaryrefslogtreecommitdiff
path: root/spec/helpers/application_helper_spec.rb
diff options
context:
space:
mode:
authorJan-Gerd Tenberge <janten@gmail.com>2015-10-22 21:37:44 +0200
committerJan-Gerd Tenberge <janten@gmail.com>2015-10-22 21:37:44 +0200
commitb32bb377993fb0224ed3bd9294d752d1a82b2ef9 (patch)
tree7925a37c6e51a7be339d934282164071b935441e /spec/helpers/application_helper_spec.rb
parent34d0cd438a7173c35c687ecb37eae1f3293b84b5 (diff)
parent7d7b6dbb9f2a8c6dbee8ab6eb0ab075705abcfbd (diff)
downloadgitlab-ce-b32bb377993fb0224ed3bd9294d752d1a82b2ef9.tar.gz
Merge remote-tracking branch 'origin/master' into gravatar-retina
Diffstat (limited to 'spec/helpers/application_helper_spec.rb')
-rw-r--r--spec/helpers/application_helper_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index bed6658ce07..eadabb2e7b4 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -97,7 +97,7 @@ describe ApplicationHelper do
it 'should call gravatar_icon when no User exists with the given email' do
expect(helper).to receive(:gravatar_icon).with('foo@example.com', 20, 2)
- helper.avatar_icon('foo@example.com', 20)
+ helper.avatar_icon('foo@example.com', 20, 2)
end
end