diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-01-23 13:04:58 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-01-23 13:04:58 +0100 |
| commit | 41498864a083663fa29131f8af74c69e82213055 (patch) | |
| tree | b838012a9480b20acb9b80ba9a2bd5e649d117e4 /spec/controllers/projects/avatars_controller_spec.rb | |
| parent | d327277c39df1537b41073912d9b4e9f765d8da5 (diff) | |
| parent | 4dc42845f2ceadcff76a99908220e61610c5b608 (diff) | |
| download | gitlab-ce-41498864a083663fa29131f8af74c69e82213055.tar.gz | |
Merge branch 'master' into qa/gb/ci-cd-qa-pipelines
* master: (69 commits)
Conflicts:
qa/qa.rb
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 |