Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 11 insertions, 3 deletions

diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb
index 836c4139107..62380299ea0 100644
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@@ -13,20 +13,28 @@ RSpec.describe CustomEmoji do
 
   describe 'exclusion of duplicated emoji' do
     let(:emoji_name) { Gitlab::Emoji.emojis_names.sample }
+    let(:group) { create(:group, :private) }
 
     it 'disallows emoji names of built-in emoji' do
-      new_emoji = build(:custom_emoji, name: emoji_name)
+      new_emoji = build(:custom_emoji, name: emoji_name, group: group)
 
       expect(new_emoji).not_to be_valid
       expect(new_emoji.errors.messages).to eq(name: ["#{emoji_name} is already being used for another emoji"])
     end
 
     it 'disallows duplicate custom emoji names within namespace' do
-      old_emoji = create(:custom_emoji)
-      new_emoji = build(:custom_emoji, name: old_emoji.name, namespace: old_emoji.namespace)
+      old_emoji = create(:custom_emoji, group: group)
+      new_emoji = build(:custom_emoji, name: old_emoji.name, namespace: old_emoji.namespace, group: group)
 
       expect(new_emoji).not_to be_valid
       expect(new_emoji.errors.messages).to eq(name: ["has already been taken"])
     end
+
+    it 'disallows non http and https file value' do
+      emoji = build(:custom_emoji, name: 'new-name', group: group, file: 'ftp://some-url.in')
+
+      expect(emoji).not_to be_valid
+      expect(emoji.errors.messages).to eq(file: ["is blocked: Only allowed schemes are http, https"])
+    end
   end
 end