Fixing up tests to match recent scope fix.

Thorsson · Sep 14, 2010 · 90ab474 · 90ab474
1 parent f0ef130
commit 90ab474
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/features/searching_across_models.feature b/features/searching_across_models.feature
@@ -7,7 +7,7 @@ Feature: Searching across multiple model
     Given Sphinx is running
     When I search for James
     And I am retrieving the result count
-    Then I should get a value of 3
+    Then I should get a value of 6
 
   Scenario: Confirming existance of a document id in a given index
     Given Sphinx is running

diff --git a/spec/thinking_sphinx/active_record/scopes_spec.rb b/spec/thinking_sphinx/active_record/scopes_spec.rb
@@ -87,10 +87,9 @@
       search.by_foo('foo').search.options[:conditions].should == {:foo => 'foo', :name => 'foo'}
     end
 
-    # FIXME: Probably the other way around is more logical? How to do this?
-    it "should apply the default scope options after other scope options to the underlying search object" do
+    it "should apply the default scope options before other scope options to the underlying search object" do
       search = ThinkingSphinx::Search.new(:classes => [Alpha])
-      search.by_name('bar').search.options[:conditions].should == {:name => 'foo'}
+      search.by_name('bar').search.options[:conditions].should == {:name => 'bar'}
     end
   end