sunspot_matchers_testunit 1.1 → 1.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sunspot_matchers_testunit (1.0)
+    sunspot_matchers_testunit (1.1)
 
 GEM
   remote: http://rubygems.org/

data/README.markdown

@@ -72,10 +72,10 @@ keywords, with, without, and order_by support wildcard expectations using the `a
       order_by :blog_id, :desc
     end
 
-    assert_has_search_params Sunspot.session, [ :with, :blog_id, any_param ]
-    assert_has_search_params Sunspot.session, [ :order_by, :blog_id, any_param ]
-    assert_has_search_params Sunspot.session, [ :order_by, any_param ]
-    assert_has_no_search_params Sunspot.session, [ :order_by, :category_ids, any_param ]
+    assert_has_search_params Sunspot.session, :with, :blog_id, any_param
+    assert_has_search_params Sunspot.session, :order_by, :blog_id, any_param
+    assert_has_search_params Sunspot.session, :order_by, any_param
+    assert_has_no_search_params Sunspot.session, :order_by, :category_ids, any_param
 
 ### :keywords
 
@@ -85,7 +85,7 @@ You can match against a keyword search:
       keywords 'great pizza'
     end
 
-    assert_has_search_params Sunspot.session, [ :keywords, 'great pizza' ]
+    assert_has_search_params Sunspot.session, :keywords, 'great pizza'
 
 ### :with
 
@@ -95,7 +95,7 @@ You can match against a with restriction:
       with :author_name, 'Mark Twain'
     end
 
-    assert_has_search_params Sunspot.session, [ :with, :author_name, 'Mark Twain' ]
+    assert_has_search_params Sunspot.session, :with, :author_name, 'Mark Twain'
 
 Complex conditions can be matched by using a Proc instead of a value.  Be aware that order does matter, not for
 the actual results that would come out of Solr, but the matcher will fail of the order of `with` restrictions is
@@ -108,12 +108,12 @@ different.
       end
     end
 
-    assert_has_search_params Sunspot.session, [ :with, Proc.new {
+    assert_has_search_params Sunspot.session, :with, Proc.new {
       any_of do
         with :category_ids, 1
         with :category_ids, 2
       end
-    } ]
+    }
 
 ### :without
 
@@ -123,7 +123,7 @@ Without is nearly identical to with:
       without :author_name, 'Mark Twain'
     end
 
-    assert_has_search_params Sunspot.session, [ :without, :author_name, 'Mark Twain' ]
+    assert_has_search_params Sunspot.session, :without, :author_name, 'Mark Twain'
 
 ### :paginate
 
@@ -133,7 +133,7 @@ You can also specify only page or per_page, both are not required.
       paginate :page => 3, :per_page => 15
     end
 
-    assert_has_search_params Sunspot.session, [ :paginate, :page => 3, :per_page => 15 ]
+    assert_has_search_params Sunspot.session, :paginate, :page => 3, :per_page => 15
 
 ### :order_by
 
@@ -143,7 +143,7 @@ Expectations on multiple orderings are supported using using the Proc format men
       order_by :published_at, :desc
     end
 
-    assert_has_search_params Sunspot.session, [ :order_by, :published_at, :desc ]
+    assert_has_search_params Sunspot.session, :order_by, :published_at, :desc
 
 ### :facet
 
@@ -153,7 +153,7 @@ Standard faceting expectation:
       facet :category_ids
     end
 
-    assert_has_search_params Sunspot.session, [ :facet, :category_ids ]
+    assert_has_search_params Sunspot.session, :facet, :category_ids
 
 Faceting where a query is excluded:
 
@@ -162,10 +162,10 @@ Faceting where a query is excluded:
       facet(:category_ids, :exclude => category_filter)
     end
 
-    assert_has_search_params Sunspot.session, [ :facet, Proc.new {
+    assert_has_search_params Sunspot.session, :facet, Proc.new {
       category_filter = with(:category_ids, 2)
       facet(:category_ids, :exclude => category_filter)
-    } ]
+    }
 
 Query faceting:
 
@@ -180,7 +180,7 @@ Query faceting:
       end
     end
     
-    assert_has_search_params Sunspot.session, [ :facet, Proc.new {
+    assert_has_search_params Sunspot.session, :facet, Proc.new {
       facet(:average_rating) do
         row(1.0..2.0) do
           with(:average_rating, 1.0..2.0)
@@ -189,7 +189,7 @@ Query faceting:
           with(:average_rating, 2.0..3.0)
         end
       end
-    } ]
+    }
 
 ### :boost
 
@@ -201,11 +201,11 @@ Field boost matching:
       end
     end
 
-    assert_has_search_params Sunspot.session, [ :boost, Proc.new {
+    assert_has_search_params Sunspot.session, :boost, Proc.new {
       keywords 'great pizza' do
         boost_fields :body => 2.0
       end
-    } ]
+    }
 
 Boost query matching:
 
@@ -217,13 +217,13 @@ Boost query matching:
       end
     end
 
-    assert_has_search_params Sunspot.session, [ :boost, Proc.new {
+    assert_has_search_params Sunspot.session, :boost, Proc.new {
       keywords 'great pizza' do
         boost(2.0) do
           with :blog_id, 4
         end
       end
-    } ]
+    }
 
 Boost function matching:
 
@@ -233,8 +233,8 @@ Boost function matching:
       end
     end
 
-    assert_has_search_params Sunspot.session, [ :boost, Proc.new {
+    assert_has_search_params Sunspot.session, :boost, Proc.new {
       keywords 'great pizza' do
         boost(function { sum(:average_rating, product(:popularity, 10)) })
       end
-    } ]
+    }

data/lib/sunspot_matchers_testunit/version.rb

@@ -1,3 +1,3 @@
 module SunspotMatchersTestunit
-  VERSION = "1.1"
+  VERSION = "1.1.1"
 end

data/test/sunspot_matchers_testunit_test.rb

@@ -36,8 +36,8 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
     Sunspot.search(Blog) do
       keywords 'bad pizza'
     end
-    assert_has_search_params Sunspot.session.searches.first, [ :keywords, 'great pizza' ]
-    assert_has_search_params Sunspot.session.searches.last, [ :keywords, 'bad pizza' ]
+    assert_has_search_params Sunspot.session.searches.first, :keywords, 'great pizza'
+    assert_has_search_params Sunspot.session.searches.last, :keywords, 'bad pizza'
   end
 
   # should allow you to specify your search on multiple models
@@ -45,21 +45,21 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
     Sunspot.search([ Post, Blog ]) do
       keywords 'great pizza'
     end
-    assert_has_search_params Sunspot.session, [ :keywords, 'great pizza' ]
+    assert_has_search_params Sunspot.session, :keywords, 'great pizza'
   end
   
   def test_match_keywords
     Sunspot.search(Post) do
       keywords 'great pizza'
     end
-    assert_has_search_params Sunspot.session, [ :keywords, 'great pizza' ]
+    assert_has_search_params Sunspot.session, :keywords, 'great pizza'
   end
 
   def test_match_keywords_nomatch
     Sunspot.search(Post) do
       keywords 'terrible pizza'
     end
-    assert_has_no_search_params Sunspot.session, [ :keywords, 'great pizza' ]
+    assert_has_no_search_params Sunspot.session, :keywords, 'great pizza'
   end
 
   def test_match_multiple_keywords
@@ -68,38 +68,38 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
       keywords 'terrible pizza'
     end
 
-    assert_has_search_params Sunspot.session, [ :keywords, Proc.new {
+    assert_has_search_params Sunspot.session, :keywords, Proc.new {
       keywords 'great pizza'
       keywords 'terrible pizza'
-    } ]
+    }
   end
 
   def test_allow_any_match_keyword
     Sunspot.search(Post) do
       keywords 'great pizza'
     end
-    assert_has_search_params Sunspot.session, [ :keywords, any_param ]
+    assert_has_search_params Sunspot.session, :keywords, any_param
   end
 
   def test_allow_any_match_keyword_negative
     Sunspot.search(Post) do
       with :blog_id, 4
     end
-    assert_has_no_search_params Sunspot.session, [ :keywords, any_param ]
+    assert_has_no_search_params Sunspot.session, :keywords, any_param
   end
 
   def test_with_matcher_matches
     Sunspot.search(Post) do
       with :author_name, 'Mark Twain'
     end
-    assert_has_search_params Sunspot.session, [ :with, :author_name, 'Mark Twain' ]
+    assert_has_search_params Sunspot.session, :with, :author_name, 'Mark Twain'
   end
 
   def test_with_matcher_doesnt_match_search
     Sunspot.search(Post) do
       with :author_name, 'Mark Twain'
     end
-    assert_has_no_search_params Sunspot.session, [ :with, :author_name, 'John Twain' ]
+    assert_has_no_search_params Sunspot.session, :with, :author_name, 'John Twain'
   end
 
   def test_with_matcher_matches_multiple_with
@@ -107,46 +107,46 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
       with :author_name, 'Mark Twain'
       with :author_name, 'John Twain'
     end
-    assert_has_search_params Sunspot.session, [ :with, Proc.new {
+    assert_has_search_params Sunspot.session, :with, Proc.new {
       with :author_name, 'Mark Twain'
       with :author_name, 'John Twain'
-    }]
+    }
   end
 
   def test_with_matcher_matches_greater_than
     Sunspot.search(Post) do
       with(:category_ids).greater_than(1)
     end
-    assert_has_search_params Sunspot.session, [ :with, Proc.new {
+    assert_has_search_params Sunspot.session, :with, Proc.new {
       with(:category_ids).greater_than(1)
-    }]
+    }
   end
 
   def test_with_matcher_matches_less_than
     Sunspot.search(Post) do
       with(:category_ids).less_than(1)
     end
-    assert_has_search_params Sunspot.session, [ :with, Proc.new {
+    assert_has_search_params Sunspot.session, :with, Proc.new {
       with(:category_ids).less_than(1)
-    }]
+    }
   end
 
   def test_with_matcher_matches_range
     Sunspot.search(Post) do
       with :category_ids, 1..3
     end
-    assert_has_search_params Sunspot.session, [ :with, Proc.new {
+    assert_has_search_params Sunspot.session, :with, Proc.new {
       with :category_ids, 1..3
-    }]
+    }
   end
 
   def test_with_matcher_matches_any_of
     Sunspot.search(Post) do
       with(:category_ids).any_of [ 1, 2 ]
     end
-    assert_has_search_params Sunspot.session, [ :with, Proc.new {
+    assert_has_search_params Sunspot.session, :with, Proc.new {
       with(:category_ids).any_of [ 1, 2 ]
-    }]
+    }
   end
 
   def test_with_matcher_matches_any_of_multiline
@@ -156,12 +156,12 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         with :category_ids, 2
       end
     end
-    assert_has_search_params Sunspot.session, [ :with, Proc.new {
+    assert_has_search_params Sunspot.session, :with, Proc.new {
       any_of do
         with :category_ids, 1
         with :category_ids, 2
       end
-    }]
+    }
   end
 
   def test_with_matcher_matches_any_of_and_all_of
@@ -174,7 +174,7 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         end
       end
     end
-    assert_has_search_params Sunspot.session, [ :with, Proc.new {
+    assert_has_search_params Sunspot.session, :with, Proc.new {
       any_of do
         with :category_ids, 1
         all_of do
@@ -182,28 +182,28 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
           with :category_ids, 3
         end
       end
-    }]
+    }
   end
 
   def test_with_matcher_matches_any_param_match
     Sunspot.search(Post) do
       with :blog_id, 4
     end
-    assert_has_search_params Sunspot.session, [ :with, :blog_id, any_param ]
+    assert_has_search_params Sunspot.session, :with, :blog_id, any_param
   end
 
   def test_with_matcher_matches_any_param_negative_no_with
     Sunspot.search(Post) do
       keywords 'great pizza'
     end
-    assert_has_no_search_params Sunspot.session, [ :with, :blog_id, any_param ]
+    assert_has_no_search_params Sunspot.session, :with, :blog_id, any_param
   end
 
   def test_with_matcher_matches_any_param_negative_diff_field
     Sunspot.search(Post) do
       with :category_ids, 7
     end
-    assert_has_no_search_params Sunspot.session, [ :with, :blog_id, any_param ]
+    assert_has_no_search_params Sunspot.session, :with, :blog_id, any_param
   end
 
   # 'without' matcher
@@ -212,21 +212,21 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
     Sunspot.search(Post) do
       without :author_name, 'Mark Twain'
     end
-    assert_has_search_params Sunspot.session, [ :without, :author_name, 'Mark Twain' ]
+    assert_has_search_params Sunspot.session, :without, :author_name, 'Mark Twain'
   end
 
   def test_without_matcher_doesnt_match_search
     Sunspot.search(Post) do
       without :author_name, 'Mark Twain'
     end
-    assert_has_no_search_params Sunspot.session, [ :without, :author_name, 'John Twain' ]
+    assert_has_no_search_params Sunspot.session, :without, :author_name, 'John Twain'
   end
 
   def test_without_matcher_doesnt_match_with_search
     Sunspot.search(Post) do
       with :author_name, 'Mark Twain'
     end
-    assert_has_no_search_params Sunspot.session, [ :without, :author_name, 'Mark Twain' ]
+    assert_has_no_search_params Sunspot.session, :without, :author_name, 'Mark Twain'
   end
 
   def test_without_matcher_matches_multiple_with
@@ -234,46 +234,46 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
       without :author_name, 'Mark Twain'
       without :author_name, 'John Twain'
     end
-    assert_has_search_params Sunspot.session, [ :without, Proc.new {
+    assert_has_search_params Sunspot.session, :without, Proc.new {
       without :author_name, 'Mark Twain'
       without :author_name, 'John Twain'
-    }]
+    }
   end
 
   def test_without_matcher_matches_greater_than
     Sunspot.search(Post) do
       without(:category_ids).greater_than(1)
     end
-    assert_has_search_params Sunspot.session, [ :without, Proc.new {
+    assert_has_search_params Sunspot.session, :without, Proc.new {
       without(:category_ids).greater_than(1)
-    }]
+    }
   end
 
   def test_without_matcher_matches_less_than
     Sunspot.search(Post) do
       without(:category_ids).less_than(1)
     end
-    assert_has_search_params Sunspot.session, [ :without, Proc.new {
+    assert_has_search_params Sunspot.session, :without, Proc.new {
       without(:category_ids).less_than(1)
-    }]
+    }
   end
 
   def test_without_matcher_matches_range
     Sunspot.search(Post) do
       without :category_ids, 1..3
     end
-    assert_has_search_params Sunspot.session, [ :without, Proc.new {
+    assert_has_search_params Sunspot.session, :without, Proc.new {
       without :category_ids, 1..3
-    }]
+    }
   end
 
   def test_without_matcher_matches_any_of
     Sunspot.search(Post) do
       without(:category_ids).any_of [ 1, 2 ]
     end
-    assert_has_search_params Sunspot.session, [ :without, Proc.new {
+    assert_has_search_params Sunspot.session, :without, Proc.new {
       without(:category_ids).any_of [ 1, 2 ]
-    }]
+    }
   end
 
   def test_without_matcher_matches_any_of_multiline
@@ -283,12 +283,12 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         without :category_ids, 2
       end
     end
-    assert_has_search_params Sunspot.session, [ :without, Proc.new {
+    assert_has_search_params Sunspot.session, :without, Proc.new {
       any_of do
         without :category_ids, 1
         without :category_ids, 2
       end
-    }]
+    }
   end
 
   def test_without_matcher_matches_any_of_and_all_of
@@ -301,7 +301,7 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         end
       end
     end
-    assert_has_search_params Sunspot.session, [ :without, Proc.new {
+    assert_has_search_params Sunspot.session, :without, Proc.new {
       any_of do
         without :category_ids, 1
         all_of do
@@ -309,28 +309,28 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
           without :category_ids, 3
         end
       end
-    }]
+    }
   end
 
   def test_without_matcher_matches_any_param_match
     Sunspot.search(Post) do
       without :blog_id, 4
     end
-    assert_has_search_params Sunspot.session, [ :without, :blog_id, any_param ]
+    assert_has_search_params Sunspot.session, :without, :blog_id, any_param
   end
 
   def test_without_matcher_matches_any_param_negative_no_without
     Sunspot.search(Post) do
       keywords 'great pizza'
     end
-    assert_has_no_search_params Sunspot.session, [ :without, :blog_id, any_param ]
+    assert_has_no_search_params Sunspot.session, :without, :blog_id, any_param
   end
 
   def test_without_matcher_matches_any_param_negative_diff_field
     Sunspot.search(Post) do
       without :category_ids, 7
     end
-    assert_has_no_search_params Sunspot.session, [ :without, :blog_id, any_param ]
+    assert_has_no_search_params Sunspot.session, :without, :blog_id, any_param
   end
 
   # 'paginate' matcher
@@ -339,49 +339,49 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
     Sunspot.search(Post) do
       paginate :page => 3, :per_page => 15
     end
-    assert_has_search_params Sunspot.session, [ :paginate, { :page => 3, :per_page => 15 } ]
+    assert_has_search_params Sunspot.session, :paginate, { :page => 3, :per_page => 15 }
   end
 
   def test_paginate_matcher_matches_page_only
     Sunspot.search(Post) do
       paginate :page => 3
     end
-    assert_has_search_params Sunspot.session, [ :paginate, { :page => 3 } ]
+    assert_has_search_params Sunspot.session, :paginate, { :page => 3 }
   end
 
   def test_paginate_matcher_matches_per_page_only
     Sunspot.search(Post) do
       paginate :per_page => 15
     end
-    assert_has_search_params Sunspot.session, [ :paginate, { :per_page => 15 } ]
+    assert_has_search_params Sunspot.session, :paginate, { :per_page => 15 }
   end
 
   def test_paginate_matcher_doesnt_match_without_per_page
     Sunspot.search(Post) do
       paginate :page => 3, :per_page => 30
     end
-    assert_has_no_search_params Sunspot.session, [ :paginate, { :page => 3, :per_page => 15 } ]
+    assert_has_no_search_params Sunspot.session, :paginate, { :page => 3, :per_page => 15 }
   end
 
   def test_paginate_matcher_doesnt_match_without_page
     Sunspot.search(Post) do
       paginate :page => 5, :per_page => 15
     end
-    assert_has_no_search_params Sunspot.session, [ :paginate, { :page => 3, :per_page => 15 } ]
+    assert_has_no_search_params Sunspot.session, :paginate, { :page => 3, :per_page => 15 }
   end
 
   def test_order_by_matcher_matches
     Sunspot.search(Post) do
       order_by :published_at, :desc
     end
-    assert_has_search_params Sunspot.session, [ :order_by, :published_at, :desc ]
+    assert_has_search_params Sunspot.session, :order_by, :published_at, :desc
   end
 
   def test_order_by_matcher_doesnt_match
     Sunspot.search(Post) do
       order_by :published_at, :asc
     end
-    assert_has_no_search_params Sunspot.session, [ :order_by, :published_at, :desc ]
+    assert_has_no_search_params Sunspot.session, :order_by, :published_at, :desc
   end
 
   def test_order_by_matcher_matches_multiple
@@ -389,10 +389,10 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
       order_by :published_at, :asc
       order_by :average_rating, :asc
     end
-    assert_has_search_params Sunspot.session, [ :order_by, Proc.new {
+    assert_has_search_params Sunspot.session, :order_by, Proc.new {
       order_by :published_at, :asc
       order_by :average_rating, :asc
-    } ]
+    }
   end
 
   def test_order_by_matcher_doesnt_match_multiple_reversed
@@ -400,10 +400,10 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
       order_by :average_rating, :asc
       order_by :published_at, :asc
     end
-    assert_has_no_search_params Sunspot.session, [ :order_by, Proc.new {
+    assert_has_no_search_params Sunspot.session, :order_by, Proc.new {
       order_by :published_at, :asc
       order_by :average_rating, :asc
-    } ]
+    }
   end
 
   def test_order_by_matcher_matches_on_random
@@ -411,10 +411,10 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
       order_by :average_rating, :asc
       order_by :random
     end
-    assert_has_search_params Sunspot.session, [ :order_by, Proc.new {
+    assert_has_search_params Sunspot.session, :order_by, Proc.new {
       order_by :average_rating, :asc
       order_by :random
-    } ]
+    }
   end
 
   def test_order_by_matcher_doesnt_match_without_random
@@ -422,9 +422,9 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
       order_by :average_rating, :asc
       order_by :random
     end
-    assert_has_no_search_params Sunspot.session, [ :order_by, Proc.new {
+    assert_has_no_search_params Sunspot.session, :order_by, Proc.new {
       order_by :average_rating, :asc
-    } ]
+    }
   end
 
   def test_order_by_matcher_with_score
@@ -432,10 +432,10 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
       order_by :average_rating, :asc
       order_by :score
     end
-    assert_has_search_params Sunspot.session, [ :order_by, Proc.new {
+    assert_has_search_params Sunspot.session, :order_by, Proc.new {
       order_by :average_rating, :asc
       order_by :score
-    } ]
+    }
   end
 
   def test_order_by_matcher_doesnt_match_without_score
@@ -443,51 +443,51 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
       order_by :average_rating, :asc
       order_by :score
     end
-    assert_has_no_search_params Sunspot.session, [ :order_by, Proc.new {
+    assert_has_no_search_params Sunspot.session, :order_by, Proc.new {
       order_by :average_rating, :asc
-    } ]
+    }
   end
 
   def test_order_by_matcher_respects_any_param_on_direction
     Sunspot.search(Post) do
       order_by :average_rating, :asc
     end
-    assert_has_search_params Sunspot.session, [ :order_by, :average_rating, any_param ]
+    assert_has_search_params Sunspot.session, :order_by, :average_rating, any_param
   end
 
   def test_order_by_matcher_respects_any_param_on_field
     Sunspot.search(Post) do
       order_by :average_rating, :asc
     end
-    assert_has_search_params Sunspot.session, [ :order_by, any_param ]
+    assert_has_search_params Sunspot.session, :order_by, any_param
   end
 
   def test_order_by_matcher_doesnt_respect_any_param_on_direction
     Sunspot.search(Post) do
       order_by :score
     end
-    assert_has_no_search_params Sunspot.session, [ :order_by, :average_rating, any_param ]
+    assert_has_no_search_params Sunspot.session, :order_by, :average_rating, any_param
   end
 
   def test_order_by_matcher_doesnt_respect_any_param_on_field
     Sunspot.search(Post) do
       keywords 'great pizza'
     end
-    assert_has_no_search_params Sunspot.session, [ :order_by, any_param ]
+    assert_has_no_search_params Sunspot.session, :order_by, any_param
   end
 
   def test_order_by_matcher_respects_any_param_on_field_and_dir
     Sunspot.search(Post) do
       order_by :score, :desc
     end
-    assert_has_search_params Sunspot.session, [ :order_by, any_param, any_param ]
+    assert_has_search_params Sunspot.session, :order_by, any_param, any_param
   end
 
   def test_order_by_matcher_respects_any_param_on_field_and_dir
     Sunspot.search(Post) do
       keywords 'great pizza'
     end
-    assert_has_no_search_params Sunspot.session, [ :order_by, any_param, any_param ]
+    assert_has_no_search_params Sunspot.session, :order_by, any_param, any_param
   end
 
   # 'facet' matcher
@@ -496,14 +496,14 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
     Sunspot.search(Post) do
       facet :category_ids
     end
-    assert_has_search_params Sunspot.session, [ :facet, :category_ids ]
+    assert_has_search_params Sunspot.session, :facet, :category_ids
   end
 
   def test_facet_matcher_doesnt_match_nonexistent_facet
     Sunspot.search(Post) do
       paginate :page => 5, :per_page => 15
     end
-    assert_has_no_search_params Sunspot.session, [ :facet, :category_ids ]
+    assert_has_no_search_params Sunspot.session, :facet, :category_ids
   end
 
   def test_facet_matcher_matches_excluding_filters
@@ -511,10 +511,10 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
       category_filter = with(:category_ids, 2)
       facet(:category_ids, :exclude => category_filter)
     end
-    assert_has_search_params Sunspot.session, [ :facet, Proc.new {
+    assert_has_search_params Sunspot.session, :facet, Proc.new {
       category_filter = with(:category_ids, 2)
       facet(:category_ids, :exclude => category_filter)
-    } ]
+    }
   end
 
   def test_query_facet_matcher_matches
@@ -528,7 +528,7 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         end
       end
     end 
-    assert_has_search_params Sunspot.session, [ :facet, Proc.new {
+    assert_has_search_params Sunspot.session, :facet, Proc.new {
       facet(:average_rating) do
         row(1.0..2.0) do
           with(:average_rating, 1.0..2.0)
@@ -537,7 +537,7 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
           with(:average_rating, 2.0..3.0)
         end
       end
-    } ]
+    }
   end
 
   def test_query_facet_matcher_doesnt_match_missing_facet
@@ -548,7 +548,7 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         end
       end
     end 
-    assert_has_no_search_params Sunspot.session, [ :facet, Proc.new {
+    assert_has_no_search_params Sunspot.session, :facet, Proc.new {
       facet(:average_rating) do
         row(1.0..2.0) do
           with(:average_rating, 1.0..2.0)
@@ -557,7 +557,7 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
           with(:average_rating, 2.0..3.0)
         end
       end
-    } ]
+    }
   end
 
   def test_query_facet_matcher_doesnt_match_different_query
@@ -571,7 +571,7 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         end
       end
     end 
-    assert_has_no_search_params Sunspot.session, [ :facet, Proc.new {
+    assert_has_no_search_params Sunspot.session, :facet, Proc.new {
       facet(:average_rating) do
         row(1.0..2.0) do
           with(:average_rating, 1.0..2.0)
@@ -580,7 +580,7 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
           with(:average_rating, 2.0..4.0)
         end
       end
-    } ]
+    }
   end
 
   # 'boost' matcher
@@ -591,11 +591,11 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         boost_fields :body => 2.0
       end
     end
-    assert_has_search_params Sunspot.session, [ :boost, Proc.new {
+    assert_has_search_params Sunspot.session, :boost, Proc.new {
       keywords 'great pizza' do
         boost_fields :body => 2.0
       end
-    } ]
+    }
   end
 
   def test_boost_matcher_doesnt_match_on_boost_mismatch
@@ -604,11 +604,11 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         boost_fields :body => 2.0
       end
     end
-    assert_has_no_search_params Sunspot.session, [ :boost, Proc.new {
+    assert_has_no_search_params Sunspot.session, :boost, Proc.new {
       keywords 'great pizza' do
         boost_fields :body => 3.0
       end
-    } ]
+    }
   end
 
   def test_boost_matcher_matches_boost_query
@@ -619,13 +619,13 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         end
       end
     end
-    assert_has_search_params Sunspot.session, [ :boost, Proc.new {
+    assert_has_search_params Sunspot.session, :boost, Proc.new {
       keywords 'great pizza' do
         boost(2.0) do
           with :blog_id, 4
         end
       end
-    } ]
+    }
   end
 
   def test_boost_matcher_doesnt_match_on_boost_query_mismatch
@@ -636,13 +636,13 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         end
       end
     end
-    assert_has_no_search_params Sunspot.session, [ :boost, Proc.new {
+    assert_has_no_search_params Sunspot.session, :boost, Proc.new {
       keywords 'great pizza' do
         boost(2.0) do
           with :blog_id, 5
         end
       end
-    } ]
+    }
   end
 
   def test_boost_matcher_matches_boost_function
@@ -651,11 +651,11 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         boost(function { sum(:average_rating, product(:popularity, 10)) })
       end
     end
-    assert_has_search_params Sunspot.session, [ :boost, Proc.new {
+    assert_has_search_params Sunspot.session, :boost, Proc.new {
       keywords 'great pizza' do
         boost(function { sum(:average_rating, product(:popularity, 10)) })
       end
-    } ]
+    }
   end
 
   def test_boost_matcher_doesnt_match_on_boost_function_mismatch
@@ -664,11 +664,11 @@ class SunspotMatchersTestunitTest < Test::Unit::TestCase
         boost(function { sum(:average_rating, product(:popularity, 10)) })
       end
     end
-    assert_has_no_search_params Sunspot.session, [ :boost, Proc.new {
+    assert_has_no_search_params Sunspot.session, :boost, Proc.new {
       keywords 'great pizza' do
         boost(function { sum(:average_rating, product(:popularity, 42)) })
       end
-    } ]
+    }
   end
 
   # 'be a search for'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_matchers_testunit
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  version: "1.1"
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Christine Yen