diff options
author | Robin Houston <robin.houston@gmail.com> | 2012-01-05 10:26:01 +0000 |
---|---|---|
committer | Robin Houston <robin.houston@gmail.com> | 2012-01-05 10:26:01 +0000 |
commit | 6a93d027e744bfc4ab2f8f7808ee99c770003481 (patch) | |
tree | b8bfe4e93e2314c8c7c9b95e99a861d8fad6b05f /spec/integration/errors_spec.rb | |
parent | 48bbe41b36402a22b808ec860c1a84673b74527f (diff) | |
parent | b06195a428b5cb6c3e95b07c631e2f18febf05f0 (diff) |
Merge branch 'release/0.5' into wdtk
Conflicts:
.gitignore
Diffstat (limited to 'spec/integration/errors_spec.rb')
-rw-r--r-- | spec/integration/errors_spec.rb | 22 |
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) |