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/models/outgoing_message_spec.rb | |
parent | 48bbe41b36402a22b808ec860c1a84673b74527f (diff) | |
parent | b06195a428b5cb6c3e95b07c631e2f18febf05f0 (diff) |
Merge branch 'release/0.5' into wdtk
Conflicts:
.gitignore
Diffstat (limited to 'spec/models/outgoing_message_spec.rb')
-rw-r--r-- | spec/models/outgoing_message_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/outgoing_message_spec.rb b/spec/models/outgoing_message_spec.rb index 1956c4d73..58d9f398e 100644 --- a/spec/models/outgoing_message_spec.rb +++ b/spec/models/outgoing_message_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe OutgoingMessage, " when making an outgoing message" do - fixtures :outgoing_messages, :info_requests, :incoming_messages, :public_bodies, :public_body_translations + fixtures :public_bodies, :public_body_translations, :public_body_versions, :info_requests, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things before do @om = outgoing_messages(:useless_outgoing_message) @@ -38,7 +38,7 @@ end describe IncomingMessage, " when censoring data" do - fixtures :outgoing_messages, :info_requests + fixtures :info_requests, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things before do @om = outgoing_messages(:useless_outgoing_message) |