diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-23 11:51:59 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-23 11:51:59 +0000 |
commit | 49e871680ce4ca4ef947916da4969cc4e80991eb (patch) | |
tree | 0128081b69f54dd8ec62d4856b1857c850e9e33e /spec | |
parent | f87ad66cee1fcce347c3072ac27613f65626646e (diff) | |
parent | 839589fde30cff9ecf963dab775bfd9b9b2fe17b (diff) | |
download | gitlab-ce-49e871680ce4ca4ef947916da4969cc4e80991eb.tar.gz |
Merge branch '43771-improve-avatar-error-message' into 'master'
Resolve "Indicate supported image formats in avatar error"
Closes #43771
See merge request gitlab-org/gitlab-ce!17747
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/group_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/user_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index abfc0896a41..d620943693c 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -240,7 +240,7 @@ describe Group do it "is false if avatar is html page" do group.update_attribute(:avatar, 'uploads/avatar.html') - expect(group.avatar_type).to eq(["only images allowed"]) + expect(group.avatar_type).to eq(["file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff"]) end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 43657e643d1..61aadddceb5 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -922,7 +922,7 @@ describe Project do it 'is false if avatar is html page' do project.update_attribute(:avatar, 'uploads/avatar.html') - expect(project.avatar_type).to eq(['only images allowed']) + expect(project.avatar_type).to eq(['file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff']) end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 5680eb24985..c61674fff13 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1222,7 +1222,7 @@ describe User do it 'is false if avatar is html page' do user.update_attribute(:avatar, 'uploads/avatar.html') - expect(user.avatar_type).to eq(['only images allowed']) + expect(user.avatar_type).to eq(['file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff']) end end |