diff options
author | Robert Speicher <robert@gitlab.com> | 2018-06-15 19:43:48 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-06-15 19:43:48 +0300 |
commit | 26810dd77111c396891d20f9a4c688bc05c84044 (patch) | |
tree | 7653f1f9b3fe2d899c274cb219f26b8c2cc45678 /spec/controllers | |
parent | 953608acb76a08285e5f7ad4c9321437a53b51fc (diff) | |
parent | 5fc3b8a08d9264eedbf886c45b4ef7b418df380d (diff) |
Merge branch 'dm-remove-favicon-main-version' into 'master'
Remove FaviconUploader favicon_main version
See merge request gitlab-org/gitlab-ce!19891
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/uploads_controller_spec.rb | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb index 1df2c954893..eb94d395a9e 100644 --- a/spec/controllers/uploads_controller_spec.rb +++ b/spec/controllers/uploads_controller_spec.rb @@ -580,23 +580,6 @@ describe UploadsController do expect(response).to have_gitlab_http_status(404) end end - - context 'has a valid filename on the version file' do - it 'successfully returns the file' do - get :show, model: 'appearance', mounted_as: 'favicon', id: appearance.id, filename: 'favicon_main_dk.png' - - expect(response).to have_gitlab_http_status(200) - expect(response.header['Content-Disposition']).to end_with 'filename="favicon_main_dk.png"' - end - end - - context 'has an invalid filename on the version file' do - it 'returns a 404' do - get :show, model: 'appearance', mounted_as: 'favicon', id: appearance.id, filename: 'favicon_bogusversion_dk.png' - - expect(response).to have_gitlab_http_status(404) - end - end end end end |