diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-06-03 10:50:17 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-06-03 10:50:17 +0100 |
commit | 050b25bd70909913b7e42d53cb69c31b1396cc46 (patch) | |
tree | ac2f2b587ffa3504c5cf5164b36f5f436c0582f4 /spec/models/user_spec.rb | |
parent | 4db18138584b6394286bbe374f22e6609ab79136 (diff) | |
parent | e30a8623a1706d3bad4476198085547d8f47cc88 (diff) |
Merge branch 'release/0.11' into wdtk
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r-- | spec/models/user_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 870e3efb8..96c169604 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -163,10 +163,10 @@ end describe User, "when reindexing referencing models" do before do - @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]) + @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]) @user = User.new(:comments => [@comment], :info_requests => [@request]) end |