Merge branch 'cache-foi-attachments-seb'

1 files changed, 7 insertions, 7 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 751a61060..e0a6c649e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -152,10 +152,10 @@ end
 describe User, "when reindexing referencing models" do 
 
     before do 
-        @request_event = mock_model(InfoRequestEvent, :xapian_mark_needs_index => true)
-        @request = mock_model(InfoRequest, :info_request_events => [@request_event])
-        @comment_event = mock_model(InfoRequestEvent, :xapian_mark_needs_index => true)
-        @comment = mock_model(Comment, :info_request_events => [@comment_event])
+        @request_event = safe_mock_model(InfoRequestEvent, :xapian_mark_needs_index => true)
+        @request = safe_mock_model(InfoRequest, :info_request_events => [@request_event])
+        @comment_event = safe_mock_model(InfoRequestEvent, :xapian_mark_needs_index => true)
+        @comment = safe_mock_model(Comment, :info_request_events => [@comment_event])
         @user = User.new(:comments => [@comment], :info_requests => [@request])
     end
     
@@ -193,7 +193,7 @@ describe User, "when reindexing referencing models" do
 end
 
 describe User, "when checking abilities" do
-    fixtures :users
+    fixtures :users, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things
 
     before do
         @user = users(:bob_smith_user)
@@ -283,7 +283,7 @@ describe User, "when setting a profile photo" do
 end
 
 describe User, "when unconfirmed" do
-    fixtures :users
+    fixtures :users, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things
 
     before do
         @user = users(:unconfirmed_user)
@@ -295,7 +295,7 @@ describe User, "when unconfirmed" do
 end
 
 describe User, "when emails have bounced" do
-    fixtures :users
+    fixtures :users, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things
 
     it "should record bounces" do
         User.record_bounce_for_email("bob@localhost", "The reason we think the email bounced (e.g. a bounce message)")