diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-22 17:46:39 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-01-22 13:45:24 -0600 |
| commit | 34c155c417867b6737ed7863956f442f5e2f12da (patch) | |
| tree | 5807fc6162291c61de7b81c2f8e573ff2bd59729 /spec/controllers/projects/avatars_controller_spec.rb | |
| parent | 31cdc7b63ac19c04eaafb2b3be5e8b11f53b14f2 (diff) | |
| download | gitlab-ce-34c155c417867b6737ed7863956f442f5e2f12da.tar.gz | |
Merge branch 'sh-fix-error-500-no-avatars' into 'master'
Fix Error 500 when repository has no avatar
Closes #42249
See merge request gitlab-org/gitlab-ce!16601
Diffstat (limited to 'spec/controllers/projects/avatars_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/avatars_controller_spec.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/spec/controllers/projects/avatars_controller_spec.rb b/spec/controllers/projects/avatars_controller_spec.rb index 3bbe168f6d5..6a41c4d23ea 100644 --- a/spec/controllers/projects/avatars_controller_spec.rb +++ b/spec/controllers/projects/avatars_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Projects::AvatarsController do - let(:project) { create(:project, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) } + let(:project) { create(:project, :repository, avatar: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")) } let(:user) { create(:user) } before do @@ -10,6 +10,12 @@ describe Projects::AvatarsController do controller.instance_variable_set(:@project, project) end + it 'GET #show' do + get :show, namespace_id: project.namespace.id, project_id: project.id + + expect(response).to have_gitlab_http_status(404) + end + it 'removes avatar from DB by calling destroy' do delete :destroy, namespace_id: project.namespace.id, project_id: project.id expect(project.avatar.present?).to be_falsey |