test/index_test.rb in searchkick-1.5.1 vs test/index_test.rb in searchkick-2.0.0

@@ -10,22 +10,22 @@
 
     # create indexes
     old_index.create
     different_index.create
 
-    Product.clean_indices
+    Product.searchkick_index.clean_indices
 
     assert Product.searchkick_index.exists?
     assert different_index.exists?
     assert !old_index.exists?
   end
 
   def test_clean_indices_old_format
     old_index = Searchkick::Index.new("products_test_20130801000000")
     old_index.create
 
-    Product.clean_indices
+    Product.searchkick_index.clean_indices
 
     assert !old_index.exists?
   end
 
   def test_total_docs
@@ -33,23 +33,17 @@
     assert_equal 1, Product.searchkick_index.total_docs
   end
 
   def test_mapping
     store_names ["Dollar Tree"], Store
-    assert_equal [], Store.search(query: {match: {name: "dollar"}}).map(&:name)
-    assert_equal ["Dollar Tree"], Store.search(query: {match: {name: "Dollar Tree"}}).map(&:name)
+    assert_equal [], Store.search(body: {query: {match: {name: "dollar"}}}).map(&:name)
+    assert_equal ["Dollar Tree"], Store.search(body: {query: {match: {name: "Dollar Tree"}}}).map(&:name)
   end
 
-  def test_json
-    store_names ["Dollar Tree"], Store
-    assert_equal [], Store.search(query: {match: {name: "dollar"}}).map(&:name)
-    assert_equal ["Dollar Tree"], Store.search(json: {query: {match: {name: "Dollar Tree"}}}, load: false).map(&:name)
-  end
-
   def test_body
     store_names ["Dollar Tree"], Store
-    assert_equal [], Store.search(query: {match: {name: "dollar"}}).map(&:name)
+    assert_equal [], Store.search(body: {query: {match: {name: "dollar"}}}).map(&:name)
     assert_equal ["Dollar Tree"], Store.search(body: {query: {match: {name: "Dollar Tree"}}}, load: false).map(&:name)
   end
 
   def test_block
     store_names ["Dollar Tree"]
@@ -59,10 +53,10 @@
       end
     assert_equal ["Dollar Tree"], products.map(&:name)
   end
 
   def test_tokens
-    assert_equal ["dollar", "dollartre", "tree"], Product.searchkick_index.tokens("Dollar Tree")
+    assert_equal ["dollar", "dollartre", "tree"], Product.searchkick_index.tokens("Dollar Tree", analyzer: "searchkick_index")
   end
 
   def test_tokens_analyzer
     assert_equal ["dollar", "tree"], Product.searchkick_index.tokens("Dollar Tree", analyzer: "searchkick_search2")
   end