Added ElasticSearch 6 to travis

mrkamel · Mar 15, 2018 · 1ad6b58 · 1ad6b58
1 parent bdf2436
commit 1ad6b58
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 gemfiles/*.lock
+irb.rb
diff --git a/.travis.yml b/.travis.yml
@@ -13,9 +13,12 @@ env:
   - ES_VERSION=1
   - ES_VERSION=2
   - ES_VERSION=5
+  - ES_VERSION=6
 
 install:
   - travis_retry bundle install
+  - sh -c "if [ '$ES_VERSION' = '6' ]; then (curl -s https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.2.tar.gz | tar xz -C /tmp); fi"
+  - sh -c "if [ '$ES_VERSION' = '6' ]; then /tmp/elasticsearch-6.2.2/bin/elasticsearch -d; fi"
   - sh -c "if [ '$ES_VERSION' = '5' ]; then (curl -s https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.4.0.tar.gz | tar xz -C /tmp); fi"
   - sh -c "if [ '$ES_VERSION' = '5' ]; then /tmp/elasticsearch-5.4.0/bin/elasticsearch -d; fi"
   - sh -c "if [ '$ES_VERSION' = '2' ]; then (curl -s https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.4.1/elasticsearch-2.4.1.tar.gz | tar xz -C /tmp); fi"

diff --git a/irb.rb b/irb.rb
diff --git a/lib/search_flip.rb b/lib/search_flip.rb
@@ -76,7 +76,7 @@ def self.msearch(criterias)
   # @return [SearchFlip::Response] The raw response
 
   def self.aliases(payload)
-    SearchFlip::HTTPClient.headers(accept: "application/json").post("#{SearchFlip::Config[:base_url]}/_aliases", body: SearchFlip::JSON.generate(payload))
+    SearchFlip::HTTPClient.headers(accept: "application/json", content_type: "application/json").post("#{SearchFlip::Config[:base_url]}/_aliases", body: SearchFlip::JSON.generate(payload))
   end
 end
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -156,7 +156,7 @@ def self.mapping
     {
       test: {
         properties: {
-          test_field: { type: "string" }
+          test_field: { type: "date" }
         }
       }
     }