diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 12:09:45 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 12:09:45 +0200 |
| commit | 8c6cbd430639f03461df625ff1cbeca1294f4b25 (patch) | |
| tree | efab5b4324c6166141e42eaaa04de3087e356b8d /spec/helpers/groups_helper.rb | |
| parent | 7780a886e7c90b2fbe281d3b8452151c20659543 (diff) | |
| parent | 4b31f4b68319a9099a36d6e59f153a1ae0a50f1d (diff) | |
| download | gitlab-ce-admin-edit-identities.tar.gz | |
Merge branch 'master' into admin-edit-identitiesadmin-edit-identities
Diffstat (limited to 'spec/helpers/groups_helper.rb')
| -rw-r--r-- | spec/helpers/groups_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/helpers/groups_helper.rb b/spec/helpers/groups_helper.rb index 3e99ab84ec9..5d174460681 100644 --- a/spec/helpers/groups_helper.rb +++ b/spec/helpers/groups_helper.rb @@ -2,14 +2,14 @@ require 'spec_helper' describe GroupsHelper do describe 'group_icon' do - avatar_file_path = File.join(Rails.root, 'public', 'gitlab_logo.png') + avatar_file_path = File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif') it 'should return an url for the avatar' do group = create(:group) group.avatar = File.open(avatar_file_path) group.save! expect(group_icon(group.path).to_s). - to match("/uploads/group/avatar/#{ group.id }/gitlab_logo.png") + to match("/uploads/group/avatar/#{ group.id }/banana_sample.gif") end it 'should give default avatar_icon when no avatar is present' do |