From 0d13873ebcb9a8f047bc24c71a3dc6a742ffdf14 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@chartkick.com>
Date: Sat, 20 Jun 2020 05:36:42 -0700
Subject: [PATCH] Moved tests [skip ci]

---
 test/boost_test.rb |  8 ++++++++
 test/match_test.rb | 34 ++++++++--------------------------
 test/model_test.rb | 19 +++++++++++++++++++
 3 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 test/model_test.rb

diff --git a/test/boost_test.rb b/test/boost_test.rb
index 9c27d8f..786ebb6 100644
--- a/test/boost_test.rb
+++ b/test/boost_test.rb
@@ -52,6 +52,14 @@ class BoostTest < Minitest::Test
     assert_order "red", ["Red", "White"], fields: [{"name^10" => :word_start}, "color"]
   end
 
+  # for issue #855
+  def test_boost_fields_apostrophes
+    store_names ["Valentine's Day Special"]
+    assert_search "Valentines", ["Valentine's Day Special"], fields: ["name^5"]
+    assert_search "Valentine's", ["Valentine's Day Special"], fields: ["name^5"]
+    assert_search "Valentine", ["Valentine's Day Special"], fields: ["name^5"]
+  end
+
   def test_boost_by
     store [
       {name: "Tomato A"},
diff --git a/test/match_test.rb b/test/match_test.rb
index a324913..2f169ca 100644
--- a/test/match_test.rb
+++ b/test/match_test.rb
@@ -208,6 +208,14 @@ class MatchTest < Minitest::Test
     assert_search "ben and jerry's", ["Ben and Jerrys"]
   end
 
+  # for issue #855
+  def test_apostrophes
+    store_names ["Valentine's Day Special"]
+    assert_search "Valentines", ["Valentine's Day Special"], fields: ["name^5"]
+    assert_search "Valentine's", ["Valentine's Day Special"], fields: ["name^5"]
+    assert_search "Valentine", ["Valentine's Day Special"], fields: ["name^5"]
+  end
+
   def test_ampersand_index
     store_names ["Ben & Jerry's"]
     assert_search "ben and jerrys", ["Ben & Jerry's"]
@@ -310,30 +318,4 @@ class MatchTest < Minitest::Test
     ]
     assert_first "blue", "Blue B", fields: [:name, :color]
   end
-
-  # for issue #855
-  def test_apostrophes
-    store_names ["Valentine's Day Special"]
-    assert_search "Valentines", ["Valentine's Day Special"], fields: ["name^5"]
-    assert_search "Valentine's", ["Valentine's Day Special"], fields: ["name^5"]
-    assert_search "Valentine", ["Valentine's Day Special"], fields: ["name^5"]
-  end
-
-  # TODO find better place
-
-  def test_search_relation
-    _, stderr = capture_io { Product.search("*") }
-    assert_equal "", stderr
-    _, stderr = capture_io { Product.all.search("*") }
-    assert_match "WARNING", stderr
-  end
-
-  def test_search_relation_default_scope
-    Band.reindex
-
-    _, stderr = capture_io { Band.search("*") }
-    assert_equal "", stderr
-    _, stderr = capture_io { Band.all.search("*") }
-    assert_match "WARNING", stderr
-  end
 end
diff --git a/test/model_test.rb b/test/model_test.rb
new file mode 100644
index 0000000..33fe690
--- /dev/null
+++ b/test/model_test.rb
@@ -0,0 +1,19 @@
+require_relative "test_helper"
+
+class ModelTest < Minitest::Test
+  def test_search_relation
+    _, stderr = capture_io { Product.search("*") }
+    assert_equal "", stderr
+    _, stderr = capture_io { Product.all.search("*") }
+    assert_match "WARNING", stderr
+  end
+
+  def test_search_relation_default_scope
+    Band.reindex
+
+    _, stderr = capture_io { Band.search("*") }
+    assert_equal "", stderr
+    _, stderr = capture_io { Band.all.search("*") }
+    assert_match "WARNING", stderr
+  end
+end
--
libgit2 0.21.0