Merge branch 'develop' into xapian-dcabo

Conflicts:
	spec/models/xapian_spec.rb

1 files changed, 13 insertions, 9 deletions

diff --git a/spec/integration/errors_spec.rb b/spec/integration/errors_spec.rb
index c64ca79e8..bfb7e5fb5 100644
--- a/spec/integration/errors_spec.rb
+++ b/spec/integration/errors_spec.rb
@@ -2,15 +2,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "When rendering errors" do
 
-    fixtures [ :info_requests,
-               :info_request_events,
-               :public_bodies,
-               :public_body_translations,
-               :users,
-               :raw_emails,
-               :outgoing_messages,
-               :incoming_messages,
-               :comments ]
+    fixtures [
+      :users,
+      :public_bodies,
+      :public_body_translations,
+      :public_body_versions,
+      :info_requests,
+      :raw_emails,
+      :outgoing_messages,
+      :incoming_messages,
+      :comments,
+      :info_request_events,
+      :track_things,
+    ]
 
     before(:each) do
         load_raw_emails_data(raw_emails)