Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 5 insertions, 2 deletions

diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index c7756a4fae5..1c359b6e50f 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -54,7 +54,7 @@ RSpec.describe API::Groups do
         it_behaves_like 'invalid file upload request'
       end
 
-      context 'when file format is not supported' do
+      context 'when file is too large' do
         let(:file_path) { 'spec/fixtures/big-image.png' }
         let(:message)   { 'is too big' }
 
@@ -661,6 +661,7 @@ RSpec.describe API::Groups do
 
   describe 'PUT /groups/:id' do
     let(:new_group_name) { 'New Group'}
+    let(:file_path) { 'spec/fixtures/dk.png' }
 
     it_behaves_like 'group avatar upload' do
       def make_upload_request
@@ -678,7 +679,8 @@ RSpec.describe API::Groups do
           request_access_enabled: true,
           project_creation_level: "noone",
           subgroup_creation_level: "maintainer",
-          default_branch_protection: ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS
+          default_branch_protection: ::Gitlab::Access::MAINTAINER_PROJECT_ACCESS,
+          avatar: fixture_file_upload(file_path)
         }
 
         expect(response).to have_gitlab_http_status(:ok)
@@ -701,6 +703,7 @@ RSpec.describe API::Groups do
         expect(json_response['shared_projects']).to be_an Array
         expect(json_response['shared_projects'].length).to eq(0)
         expect(json_response['default_branch_protection']).to eq(::Gitlab::Access::MAINTAINER_PROJECT_ACCESS)
+        expect(json_response['avatar_url']).to end_with('dk.png')
       end
 
       context 'updating the `default_branch_protection` attribute' do