diff options
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 6 | ||||
| -rw-r--r-- | spec/models/info_request_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/xapian_spec.rb | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index 42ea748fd..70d92356f 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe IncomingMessage, " when dealing with incoming mail" do fixtures :incoming_messages, :raw_emails, :info_requests - before do + before(:each) do @im = incoming_messages(:useless_incoming_message) load_raw_emails_data(raw_emails) end @@ -112,7 +112,7 @@ end describe IncomingMessage, " when censoring data" do fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users - before do + before(:each) do @test_data = "There was a mouse called Stilton, he wished that he was blue." @im = incoming_messages(:useless_incoming_message) @@ -204,7 +204,7 @@ end describe IncomingMessage, " when censoring whole users" do fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users - before do + before(:each) do @test_data = "There was a mouse called Stilton, he wished that he was blue." @im = incoming_messages(:useless_incoming_message) diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index ba80256ab..b82052a0f 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -5,7 +5,7 @@ describe InfoRequest do describe "guessing a request from an email" do fixtures :info_requests, :public_bodies, :incoming_messages, :raw_emails - before do + before(:each) do @im = incoming_messages(:useless_incoming_message) load_raw_emails_data(raw_emails) end diff --git a/spec/models/xapian_spec.rb b/spec/models/xapian_spec.rb index 37e68b145..0c6fa6bb6 100644 --- a/spec/models/xapian_spec.rb +++ b/spec/models/xapian_spec.rb @@ -34,7 +34,7 @@ describe User, " when indexing users with Xapian" do end describe PublicBody, " when indexing public bodies with Xapian" do - fixtures :public_bodies, :public_body_translations, :incoming_messages, :outgoing_messages, :raw_emails, :comments + fixtures :public_bodies, :public_body_translations, :incoming_messages, :outgoing_messages, :raw_emails, :comments, :info_requests before(:each) do load_raw_emails_data(raw_emails) end @@ -74,6 +74,10 @@ end describe PublicBody, " when indexing requests by body they are to" do fixtures :public_bodies, :public_body_translations, :info_request_events, :info_requests, :raw_emails, :comments + before(:each) do + load_raw_emails_data(raw_emails) + end + it "should find requests to the body" do rebuild_xapian_index xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1) |