adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix

1 files changed, 22 insertions, 0 deletions

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 1738f3443cf..ed50bf7c75d 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -56,6 +56,28 @@ describe ApplicationHelper do
     end
   end
 
+  describe 'project_icon' do
+    avatar_file_path = File.join(Rails.root, 'public', 'gitlab_logo.png')
+
+    it 'should return an url for the avatar' do
+      project = create(:project)
+      project.avatar = File.open(avatar_file_path)
+      project.save!
+      project_icon(project.to_param).to_s.should ==
+        "/uploads/project/avatar/#{ project.id }/gitlab_logo.png"
+    end
+
+    it "should give uploaded icon when present" do
+      project = create(:project)
+      project.save!
+
+      Project.any_instance.stub(:avatar_in_git).and_return(true)
+
+      project_icon(project.to_param).to_s.should match(
+        image_tag(project_avatar_path(project)))
+    end
+  end
+
   describe "avatar_icon" do
     avatar_file_path = File.join(Rails.root, 'public', 'gitlab_logo.png')