diff options
author | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:40 +0000 |
---|---|---|
committer | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:40 +0000 |
commit | a76010c99459559a29901ed75b847384248c7c6e (patch) | |
tree | f199e3f4187091a7a7c78f7fd6901529658174f7 /spec/models/outgoing_message_spec.rb | |
parent | 9f9befeba613deff85c2325f629e77099d44af6f (diff) | |
parent | 18c9436ba00574d44dc258a2f231d4758b378eae (diff) |
Merge branch 'wdtk' into release/0.5
Conflicts:
locale/app.pot
Diffstat (limited to 'spec/models/outgoing_message_spec.rb')
-rw-r--r-- | spec/models/outgoing_message_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/models/outgoing_message_spec.rb b/spec/models/outgoing_message_spec.rb index 58d9f398e..51bb6fdf5 100644 --- a/spec/models/outgoing_message_spec.rb +++ b/spec/models/outgoing_message_spec.rb @@ -1,7 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe OutgoingMessage, " when making an outgoing message" do - 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 +37,6 @@ end describe IncomingMessage, " when censoring data" do - fixtures :info_requests, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things before do @om = outgoing_messages(:useless_outgoing_message) |