summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-09-27 13:21:58 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 16:20:20 +0200
commitbf27c6841c1cb6b68f67d33d6eb2de63ad8b390f (patch)
tree460a34d05f75d31bb88500fed7c3c7b38830ce70 /spec/models
parent0a76bcb412b6a193d30c930312ac40dc21e777e6 (diff)
downloadgitlab-ce-bf27c6841c1cb6b68f67d33d6eb2de63ad8b390f.tar.gz
send ico files with inline disposition
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/group_spec.rb2
-rw-r--r--spec/models/project_spec.rb2
-rw-r--r--spec/models/user_spec.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index f83b52e8975..8f1f4938065 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(["file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff"])
+ 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, ico"])
end
end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 9a76452a808..ed1253c6d97 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -960,7 +960,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(['file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff'])
+ 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, ico'])
end
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 09dfeae6377..097144d04ce 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1260,7 +1260,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(['file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff'])
+ 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, ico'])
end
end