From d33e71a96f34b51d0f67e7ed32044318f5d8bc2d Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@chartkick.com>
Date: Thu, 18 Jun 2020 06:12:24 -0700
Subject: [PATCH] Take 2

---
 test/ci/install_elasticsearch.sh | 16 ++++++++++------
 test/language_test.rb            |  2 ++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/test/ci/install_elasticsearch.sh b/test/ci/install_elasticsearch.sh
index 77193f6..3e358c7 100755
--- a/test/ci/install_elasticsearch.sh
+++ b/test/ci/install_elasticsearch.sh
@@ -14,6 +14,16 @@ if [ ! -d "$CACHE_DIR" ]; then
   wget -O elasticsearch-$ELASTICSEARCH_VERSION.tar.gz $URL
   tar xvfz elasticsearch-$ELASTICSEARCH_VERSION.tar.gz
   mv elasticsearch-$ELASTICSEARCH_VERSION $CACHE_DIR
+
+  cd $CACHE_DIR
+
+  bin/elasticsearch-plugin install analysis-kuromoji
+  if [[ $ELASTICSEARCH_VERSION != 6.0.* ]]; then
+    bin/elasticsearch-plugin install analysis-nori
+  fi
+  bin/elasticsearch-plugin install analysis-smartcn
+  bin/elasticsearch-plugin install analysis-stempel
+  bin/elasticsearch-plugin install analysis-ukrainian
 else
   echo "Elasticsearch cached"
 fi
@@ -21,9 +31,3 @@ fi
 cd $CACHE_DIR
 bin/elasticsearch -d
 for i in {1..12}; do wget -O- -v http://127.0.0.1:9200/ && break || sleep 5; done
-
-bin/elasticsearch-plugin install analysis-kuromoji
-bin/elasticsearch-plugin install analysis-nori
-bin/elasticsearch-plugin install analysis-smartcn
-bin/elasticsearch-plugin install analysis-stempel
-bin/elasticsearch-plugin install analysis-ukrainian
diff --git a/test/language_test.rb b/test/language_test.rb
index 2c30b9e..746659c 100644
--- a/test/language_test.rb
+++ b/test/language_test.rb
@@ -52,6 +52,8 @@ class LanguageTest < Minitest::Test
   end
 
   def test_korean2
+    skip if Searchkick.server_below?("6.4.0")
+
     # requires https://www.elastic.co/guide/en/elasticsearch/plugins/7.4/analysis-nori.html
     with_options(Song, language: "korean2") do
       store_names ["한국어를 처리하는 예시입니닼ㅋㅋ"], Song
--
libgit2 0.21.0