Merge #408

408: Speed up tests r=brunoocasali a=ellnix

In preparation for adding more tests, which itself is in preparation for some serious refactoring.


Co-authored-by: ellnix <[email protected]>
Co-authored-by: Bruno Casali <[email protected]>

Author: 3 people

spec/model_methods_spec.rb

@@ -8,17 +8,18 @@
     it 'uses the specified scope' do
       TestUtil.reset_colors!
 
-      Color.create!(name: 'red', short_name: 'r3', hex: 3)
-      Color.create!(name: 'red', short_name: 'r1', hex: 1)
-      Color.create!(name: 'purple', short_name: 'p')
-
-      Color.clear_index!(true)
-
+      # rubocop:disable Rails/SkipsModelValidations
+      Color.insert_all([
+                         { name: 'red', short_name: 'r3', hex: 3 },
+                         { name: 'red', short_name: 'r1', hex: 1 },
+                         { name: 'purple', short_name: 'p', hex: 4 }
+                       ])
+      # rubocop:enable Rails/SkipsModelValidations
       Color.where(name: 'red').reindex!(3, true)
       expect(Color.search('').size).to eq(2)
 
-      Color.clear_index!(true)
-      Color.where(id: Color.first.id).reindex!(3, true)
+      Color.clear_index!
+      Color.where(name: 'purple').reindex!(3, true)
       expect(Color.search('').size).to eq(1)
     end
   end
@@ -66,6 +67,7 @@
         )
       end
 
+      # No need to await since Book is synchronous
       expect(Book.search('Frankenstein')).to be_one
     end
   end
@@ -77,6 +79,7 @@
       _blue = Color.create!(name: 'blue', short_name: 'blu', hex: 0x0000FF)
       _black = Color.create!(name: 'black', short_name: 'bla', hex: 0x000000)
 
+      # No need to await since Color is synchronous
       json = Color.raw_search('')
       Color.index_documents Color.limit(1), true # reindex last color, `limit` is incompatible with the reindex! method
       expect(json['hits'].count).to eq(Color.raw_search('')['hits'].count)

spec/ms_clean_up_job_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'support/models/restaurant'
+require 'support/models/book'
 
 RSpec.describe 'Meilisearch::Rails::MSCleanUpJob' do
   include ActiveJob::TestHelper
@@ -9,10 +11,6 @@ def clean_up_indexes
 
   def create_indexed_record
     record
-
-    indexes.each do |index|
-      index.wait_for_task(index.tasks['results'].last['uid'])
-    end
   end
 
   subject(:clean_up) { Meilisearch::Rails::MSCleanUpJob }

spec/safe_index_spec.rb

@@ -8,9 +8,8 @@
       genres = %w[Legend Fiction Crime].cycle
       authors = %w[A B C].cycle
 
-      5.times do
-        Book.create! name: Faker::Book.title, author: authors.next, genre: genres.next
-      end
+      Book.insert_all(Array.new(5) { { name: Faker::Book.title, author: authors.next, genre: genres.next } }) # rubocop:disable Rails/SkipsModelValidations
+      Book.reindex!
 
       expect do
         Book.index.facet_search('genre', 'Fic', filter: 'author = A')

spec/support/models/animals.rb

@@ -34,9 +34,9 @@ def ms_id
 
 module TestUtil
   def self.reset_animals!
-    Cat.clear_index!(true)
+    Cat.clear_index!
     Cat.delete_all
-    Dog.clear_index!(true)
+    Dog.clear_index!
     Dog.delete_all
   end
 end

spec/support/models/book.rb

@@ -35,7 +35,7 @@ def public?
 
 module TestUtil
   def self.reset_books!
-    Book.clear_index!(true)
+    Book.clear_index!
     Book.index(safe_index_uid('BookAuthor')).delete_all_documents
     Book.index(safe_index_uid('Book')).delete_all_documents
   end

spec/support/models/color.rb

@@ -39,7 +39,7 @@ def will_save_change_to_short_name?
 
 module TestUtil
   def self.reset_colors!
-    Color.clear_index!(true)
+    Color.clear_index!
     Color.delete_all
   end
 end

spec/support/models/movie.rb

@@ -15,7 +15,7 @@ class Movie < ActiveRecord::Base
 
 module TestUtil
   def self.reset_movies!
-    Movie.clear_index!(true)
+    Movie.clear_index!
     Movie.delete_all
   end
 end

spec/support/models/people.rb

@@ -25,7 +25,7 @@ def will_save_change_to_full_name?
 
 module TestUtil
   def self.reset_people!
-    People.clear_index!(true)
+    People.clear_index!
     People.delete_all
   end
 end