diff --git a/spec/controllers/choices_controller_spec.rb b/spec/controllers/choices_controller_spec.rb
index fda4108..5f4a7c1 100644
--- a/spec/controllers/choices_controller_spec.rb
+++ b/spec/controllers/choices_controller_spec.rb
@@ -69,9 +69,7 @@ describe ChoicesController do
        
        it "adds visitor_id params to flag if sent" do
 	    @visitor_identifier = "somelongunique32charstring"
-	    visitor_list = [mock_visitor]
-            @user.stub!(:visitors).and_return(visitor_list)
-            visitor_list.should_receive(:find_or_create_by_identifier).with(@visitor_identifier).and_return(mock_visitor)
+            Visitor.should_receive(:find_or_create_by_identifier_and_site_id).with(@visitor_identifier, @user.id).and_return(mock_visitor)
 
 	    Flag.should_receive(:create!).with({:choice_id => 123, :question_id => 37, :site_id => @user.id, :explanation => "This is offensive", :visitor_id => mock_visitor.id})   
 
--
libgit2 0.21.2