From 1812a38f0a4194eba799ca56b492986db0088498 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 21 Mar 2019 13:46:10 -0400
Subject: [PATCH] FIX: upload watched words should use UTF-8

---
 .../admin/watched_words_controller.rb         |  2 +-
 spec/fixtures/csv/words.csv                   |  6 ++++++
 spec/integration/watched_words_spec.rb        | 21 +++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/csv/words.csv

diff --git a/app/controllers/admin/watched_words_controller.rb b/app/controllers/admin/watched_words_controller.rb
index 119562dc4e0..3be2ea24c9a 100644
--- a/app/controllers/admin/watched_words_controller.rb
+++ b/app/controllers/admin/watched_words_controller.rb
@@ -25,7 +25,7 @@ class Admin::WatchedWordsController < Admin::AdminController
 
     Scheduler::Defer.later("Upload watched words") do
       begin
-        File.open(file.tempfile, encoding: "ISO-8859-1").each_line do |line|
+        File.open(file.tempfile, encoding: "bom|utf-8").each_line do |line|
           WatchedWord.create_or_update_word(word: line, action_key: action_key) unless line.empty?
         end
         data = { url: '/ok' }
diff --git a/spec/fixtures/csv/words.csv b/spec/fixtures/csv/words.csv
new file mode 100644
index 00000000000..646d6447299
--- /dev/null
+++ b/spec/fixtures/csv/words.csv
@@ -0,0 +1,6 @@
+thread
+线
+धागा
+실
+tråd
+нить
diff --git a/spec/integration/watched_words_spec.rb b/spec/integration/watched_words_spec.rb
index 646084da860..6fe25b22d29 100644
--- a/spec/integration/watched_words_spec.rb
+++ b/spec/integration/watched_words_spec.rb
@@ -179,4 +179,25 @@ describe WatchedWord do
       }.to_not change { PostAction.count }
     end
   end
+
+  describe 'upload' do
+    context 'logged in as admin' do
+      before do
+        sign_in(admin)
+      end
+
+      it 'creates the words from the file' do
+        post '/admin/logs/watched_words/upload.json', params: {
+          action_key: 'flag',
+          file: Rack::Test::UploadedFile.new(file_from_fixtures("words.csv", "csv"))
+        }
+        expect(response.status).to eq(200)
+        expect(WatchedWord.count).to eq(6)
+        expect(WatchedWord.pluck(:word)).to contain_exactly(
+          'thread', '线', 'धागा', '실', 'tråd', 'нить'
+        )
+        expect(WatchedWord.pluck(:action).uniq).to eq([WatchedWord.actions[:flag]])
+      end
+    end
+  end
 end