[STORE] Updated the failing integration tests for Elasticsearch 5.x

Author: karmi

Diff for: elasticsearch-persistence/README.md

@@ -491,8 +491,8 @@ class Article
   # Define an `author` attribute, with multiple analyzers for this field
   #
   attribute :author, String, mapping: { fields: {
-                               author: { type: 'string'},
-                               raw:    { type: 'string', analyzer: 'keyword' }
+                               author: { type: 'text'},
+                               raw:    { type: 'keyword' }
                              } }
 
 

Diff for: elasticsearch-persistence/lib/elasticsearch/persistence/model/find.rb

@@ -119,7 +119,8 @@ def find_in_batches(options={}, &block)
 
             # Get the initial batch of documents and the scroll_id
             #
-            response = gateway.client.search( { index: gateway.index_name,
+            response = gateway.client.search( {
+                                         index: gateway.index_name,
                                          type:  gateway.document_type,
                                          scroll: scroll,
                                          sort:   ['_doc'],

Diff for: elasticsearch-persistence/test/integration/model/model_basic_test.rb

@@ -16,8 +16,8 @@ class ::Person
 
         attribute :name, String,
                   mapping: { fields: {
-                    name: { type: 'string', analyzer: 'snowball' },
-                    raw:  { type: 'string', analyzer: 'keyword' }
+                    name: { type: 'text', analyzer: 'snowball' },
+                    raw:  { type: 'keyword' }
                   } }
 
         attribute :birthday,   Date

Diff for: elasticsearch-persistence/test/unit/model_rails_test.rb

@@ -11,7 +11,7 @@ class ::MyRailsModel
   include Elasticsearch::Persistence::Model
   include Elasticsearch::Persistence::Model::Rails
 
-  attribute :name, String, mapping: { analyzer: 'string' }
+  attribute :name, String, mapping: { analyzer: 'english' }
   attribute :published_at, DateTime
   attribute :published_on, Date
 end