[MODEL] Prevent integration test failures due to uneven distributions of documents across shards

(Tests depend on order of docs in the results.)

Author: karmi

elasticsearch-model/test/integration/active_record_associations_test.rb

@@ -42,24 +42,26 @@ module Searchable
 
     # Set up the mapping
     #
-    mapping do
-      indexes :title,      analyzer: 'snowball'
-      indexes :created_at, type: 'date'
-
-      indexes :authors do
-        indexes :first_name
-        indexes :last_name
-        indexes :full_name, type: 'multi_field' do
-          indexes :full_name
-          indexes :raw, analyzer: 'keyword'
+    settings index: { number_of_shards: 1, number_of_replicas: 0 } do
+      mapping do
+        indexes :title,      analyzer: 'snowball'
+        indexes :created_at, type: 'date'
+
+        indexes :authors do
+          indexes :first_name
+          indexes :last_name
+          indexes :full_name, type: 'multi_field' do
+            indexes :full_name
+            indexes :raw, analyzer: 'keyword'
+          end
         end
-      end
 
-      indexes :categories, analyzer: 'keyword'
+        indexes :categories, analyzer: 'keyword'
 
-      indexes :comments, type: 'nested' do
-        indexes :text
-        indexes :author
+        indexes :comments, type: 'nested' do
+          indexes :text
+          indexes :author
+        end
       end
     end
 
@@ -228,7 +230,7 @@ class ActiveRecordAssociationsIntegrationTest < Elasticsearch::Test::Integration
 
           assert_equal 3, response.results.size
           assert_equal 3, response.records.size
-        end
+        end if ::ActiveRecord.respond_to?(:version) && ::ActiveRecord.version.to_s > '4'
 
         should "reindex a document after comments are added" do
           # Create posts
@@ -270,7 +272,7 @@ class ActiveRecordAssociationsIntegrationTest < Elasticsearch::Test::Integration
             }
 
           assert_equal 1, response.results.size
-        end
+        end if ::ActiveRecord.respond_to?(:version) && ::ActiveRecord.version.to_s > '4'
 
         should "reindex a document after Post#touch" do
           # Create categories

elasticsearch-model/test/integration/active_record_basic_test.rb

@@ -10,9 +10,11 @@ class ::Article < ActiveRecord::Base
         include Elasticsearch::Model
         include Elasticsearch::Model::Callbacks
 
-        mapping do
-          indexes :title,      type: 'string', analyzer: 'snowball'
-          indexes :created_at, type: 'date'
+        settings index: { number_of_shards: 1, number_of_replicas: 0 } do
+          mapping do
+            indexes :title,      type: 'string', analyzer: 'snowball'
+            indexes :created_at, type: 'date'
+          end
         end
       end
 

elasticsearch-model/test/integration/mongoid_basic_test.rb

@@ -33,9 +33,11 @@ class ::MongoidArticle
           field :title, type: String
           attr_accessible :title if respond_to? :attr_accessible
 
-          mapping do
-            indexes :title,      type: 'string', analyzer: 'snowball'
-            indexes :created_at, type: 'date'
+          settings index: { number_of_shards: 1, number_of_replicas: 0 } do
+            mapping do
+              indexes :title,      type: 'string', analyzer: 'snowball'
+              indexes :created_at, type: 'date'
+            end
           end
 
           def as_indexed_json(options={})