Merge branch 'master' into activejob

Andrew Kane
2 parents b07e444a 7290906f
Showing 2 changed files with 4 additions and 1 deletions Show diff stats
test/index_test.rb
test/suggest_test.rb
@@ -53,6 +53,8 @@ class TestIndex &lt; Minitest::Test
     store_names ["Product A", "Product B"]
     Product.where(name: "Product A").delete_all
     assert_search "product", ["Product B"]
+  ensure
+    Product.reindex
   end
  
   def test_bad_mapping
@@ -23,7 +23,8 @@ class TestSuggest &lt; Minitest::Test
  
   def test_multiple_fields
     store [
-      {name: "Shark", color: "Sharp"}
+      {name: "Shark", color: "Sharp"},
+      {name: "Shark", color: "Sharp"},
     ]
     assert_suggest_all "shar", ["shark", "sharp"]
   end
...	...	@@ -53,6 +53,8 @@ class TestIndex < Minitest::Test
53	53	store_names ["Product A", "Product B"]
54	54	Product.where(name: "Product A").delete_all
55	55	assert_search "product", ["Product B"]
	56	+ ensure
	57	+ Product.reindex
56	58	end
57	59
58	60	def test_bad_mapping
...	...
...	...	@@ -23,7 +23,8 @@ class TestSuggest < Minitest::Test
23	23
24	24	def test_multiple_fields
25	25	store [
26		- {name: "Shark", color: "Sharp"}
	26	+ {name: "Shark", color: "Sharp"},
	27	+ {name: "Shark", color: "Sharp"},
27	28	]
28	29	assert_suggest_all "shar", ["shark", "sharp"]
29	30	end
...	...