Fix: #442 カスタム絵文字のaliasesにnullが入る場合がある (#443)

* Fix: #442 カスタム絵文字のaliasesにnullが入る場合がある

* Fix test

* WebのほうにもNULLチェックを追加

* ローカルのエイリアス名を編集するところもついでにスリムに

spec/models/custom_emoji_spec.rb

@@ -49,6 +49,52 @@ RSpec.describe CustomEmoji do
     end
   end
 
+  describe '#copy!' do
+    subject do
+      custom_emoji.copy!
+      described_class.where.not(id: custom_emoji.id).find_by(domain: nil, shortcode: custom_emoji.shortcode)
+    end
+
+    context 'when a simple case' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, license: 'Ohagi', aliases: %w(aaa bbb), domain: 'example.com', uri: 'https://example.com/emoji') }
+
+      it 'makes a copy ot the emoji' do
+        emoji = subject
+        expect(emoji).to_not be_nil
+        expect(emoji.license).to eq 'Ohagi'
+        expect(emoji.aliases).to eq %w(aaa bbb)
+      end
+    end
+
+    context 'when local has already same emoji' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, domain: nil) }
+
+      it 'does not make a copy of the emoji' do
+        expect(subject).to be_nil
+      end
+    end
+
+    context 'when aliases is null' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, aliases: nil, domain: 'example.com', uri: 'https://example.com/emoji') }
+
+      it 'makes a copy of the emoji but aliases property is normalized' do
+        emoji = subject
+        expect(emoji).to_not be_nil
+        expect(emoji.aliases).to eq []
+      end
+    end
+
+    context 'when aliases contains null' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, aliases: [nil], domain: 'example.com', uri: 'https://example.com/emoji') }
+
+      it 'makes a copy of the emoji but aliases property is normalized' do
+        emoji = subject
+        expect(emoji).to_not be_nil
+        expect(emoji.aliases).to eq []
+      end
+    end
+  end
+
   describe '#object_type' do
     it 'returns :emoji' do
       custom_emoji = Fabricate(:custom_emoji)

spec/models/form/custom_emoji_batch_spec.rb

@@ -95,12 +95,12 @@ describe Form::CustomEmojiBatch do
     end
 
     describe 'the copy action' do
-      let(:custom_emoji) { Fabricate(:custom_emoji) }
+      let(:custom_emoji) { Fabricate(:custom_emoji, domain: 'example.com', uri: 'https://example.com/emoji') }
       let(:options) { { action: 'copy', custom_emoji_ids: [custom_emoji.id] } }
 
       it 'makes a copy of the emoji' do
         expect { subject.save }
-          .to change(CustomEmoji, :count).by(1)
+          .to change(CustomEmoji, :count).by(2)
       end
     end
 

spec/serializers/rest/custom_emoji_serializer_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe REST::CustomEmojiSerializer do
+  let(:serialization) { serialized_record_json(record, described_class) }
+  let(:record) do
+    Fabricate(:custom_emoji, shortcode: 'ohagi', aliases: aliases)
+  end
+  let(:aliases) { [] }
+
+  context 'when empty aliases' do
+    it 'returns normalized aliases' do
+      expect(serialization['aliases']).to eq []
+    end
+  end
+
+  context 'when null aliases' do
+    let(:aliases) { nil }
+
+    it 'returns normalized aliases' do
+      expect(serialization['aliases']).to eq []
+    end
+  end
+
+  context 'when aliases contains null' do
+    let(:aliases) { [nil] }
+
+    it 'returns normalized aliases' do
+      expect(serialization['aliases']).to eq []
+    end
+  end
+
+  context 'when aliases contains normal text' do
+    let(:aliases) { ['neko'] }
+
+    it 'returns normalized aliases' do
+      expect(serialization['aliases']).to eq ['neko']
+    end
+  end
+end