diff options
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/has_tag_string_tag_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 4 | ||||
| -rw-r--r-- | spec/models/info_request_spec.rb | 6 | ||||
| -rw-r--r-- | spec/models/outgoing_mailer_spec.rb | 4 | ||||
| -rw-r--r-- | spec/models/public_body_spec.rb | 4 | ||||
| -rw-r--r-- | spec/models/request_mailer_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/xapian_spec.rb | 7 |
7 files changed, 14 insertions, 15 deletions
diff --git a/spec/models/has_tag_string_tag_spec.rb b/spec/models/has_tag_string_tag_spec.rb index 9dfcf3daf..ba439acb8 100644 --- a/spec/models/has_tag_string_tag_spec.rb +++ b/spec/models/has_tag_string_tag_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe HasTagString::HasTagStringTag, " when fiddling with tag strings " do - fixtures :public_bodies + fixtures :public_bodies, :public_body_translations it "should be able to make a new tag and save it" do @tag = HasTagString::HasTagStringTag.new diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index 1e2b21964..abbe94a47 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -109,7 +109,7 @@ describe IncomingMessage, " checking validity to reply to" do end describe IncomingMessage, " when censoring data" do - fixtures :incoming_messages, :raw_emails, :public_bodies, :info_requests, :users + fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users before do @test_data = "There was a mouse called Stilton, he wished that he was blue." @@ -199,7 +199,7 @@ describe IncomingMessage, " when censoring data" do end describe IncomingMessage, " when censoring whole users" do - fixtures :incoming_messages, :raw_emails, :public_bodies, :info_requests, :users + fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users before do @test_data = "There was a mouse called Stilton, he wished that he was blue." diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index 59868f647..00ae218da 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -40,7 +40,7 @@ describe InfoRequest do describe " when emailing" do - fixtures :info_requests, :info_request_events, :public_bodies, :users + fixtures :info_requests, :info_request_events, :public_bodies, :public_body_translations, :users before do @info_request = info_requests(:fancy_dog_request) @@ -120,7 +120,7 @@ describe InfoRequest do end describe "when calculating the status" do - fixtures :info_requests, :info_request_events, :holidays, :public_bodies + fixtures :info_requests, :info_request_events, :holidays, :public_bodies, :public_body_translations before do @ir = info_requests(:naughty_chicken_request) @@ -160,7 +160,7 @@ describe InfoRequest do end describe "when calculating the status for a school" do - fixtures :info_requests, :info_request_events, :holidays, :public_bodies + fixtures :info_requests, :info_request_events, :holidays, :public_bodies, :public_body_translations before do @ir = info_requests(:naughty_chicken_request) diff --git a/spec/models/outgoing_mailer_spec.rb b/spec/models/outgoing_mailer_spec.rb index e86f5635c..3073c5ffd 100644 --- a/spec/models/outgoing_mailer_spec.rb +++ b/spec/models/outgoing_mailer_spec.rb @@ -4,7 +4,7 @@ describe OutgoingMailer, " when working out follow up addresses" do # This is done with fixtures as the code is a bit tangled with the way it # calls TMail. XXX untangle it and make these tests spread out and using # mocks. Put parts of the tests in spec/lib/tmail_extensions.rb - fixtures :info_requests, :incoming_messages, :raw_emails, :public_bodies + fixtures :info_requests, :incoming_messages, :raw_emails, :public_bodies, :public_body_translations it "should parse them right" do ir = info_requests(:fancy_dog_request) @@ -24,7 +24,7 @@ describe OutgoingMailer, " when working out follow up addresses" do # check the basic entry in the fixture is fine OutgoingMailer.name_and_email_for_followup(ir, im).should == "foiperson@localhost" - OutgoingMailer.name_for_followup(ir, im).should == "The Geraldine Quango" + OutgoingMailer.name_for_followup(ir, im).should == "Geraldine Quango" OutgoingMailer.email_for_followup(ir, im).should == "foiperson@localhost" end diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index f00138ab3..acfe005e8 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -95,7 +95,7 @@ describe PublicBody, " using machine tags" do end describe PublicBody, "when finding_by_tags" do - fixtures :public_bodies + fixtures :public_bodies, :public_body_translations before do @geraldine = public_bodies(:geraldine_public_body) @@ -161,7 +161,7 @@ describe PublicBody, " when saving" do end describe PublicBody, "when searching" do - fixtures :public_bodies, :public_body_versions + fixtures :public_bodies, :public_body_translations, :public_body_versions it "should find by existing url name" do body = PublicBody.find_by_url_name_with_historic('dfh') diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb index b9e845c1d..a8311e8f8 100644 --- a/spec/models/request_mailer_spec.rb +++ b/spec/models/request_mailer_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe RequestMailer, " when receiving incoming mail" do - fixtures :info_requests, :incoming_messages, :raw_emails, :users, :public_bodies + fixtures :info_requests, :incoming_messages, :raw_emails, :users, :public_bodies, :public_body_translations it "should append it to the appropriate request" do ir = info_requests(:fancy_dog_request) diff --git a/spec/models/xapian_spec.rb b/spec/models/xapian_spec.rb index 36836d95b..79ffc4839 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, :incoming_messages, :outgoing_messages, :raw_emails, :comments + fixtures :public_bodies, :public_body_translations, :incoming_messages, :outgoing_messages, :raw_emails, :comments it "should search index the main name field" do rebuild_xapian_index @@ -69,7 +69,7 @@ describe PublicBody, " when indexing public bodies with Xapian" do end describe PublicBody, " when indexing requests by body they are to" do - fixtures :public_bodies, :info_request_events, :info_requests, :raw_emails, :comments + fixtures :public_bodies, :public_body_translations, :info_request_events, :info_requests, :raw_emails, :comments it "should find requests to the body" do rebuild_xapian_index @@ -290,7 +290,7 @@ describe InfoRequest, " when indexing requests by tag" do end describe PublicBody, " when indexing authorities by tag" do - fixtures :public_bodies, :incoming_messages, :outgoing_messages, :raw_emails, :comments + fixtures :public_bodies, :public_body_translations, :incoming_messages, :outgoing_messages, :raw_emails, :comments it "should find request by tag, even when changes" do rebuild_xapian_index @@ -302,7 +302,6 @@ describe PublicBody, " when indexing authorities by tag" do xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1) xapian_object.results.size.should == 1 xapian_object.results[0][:model] == public_bodies(:geraldine_public_body) - xapian_object = InfoRequest.full_search([PublicBody], "tag:mice:3", 'created_at', true, nil, 100, 1) xapian_object.results.size.should == 1 xapian_object.results[0][:model] == public_bodies(:geraldine_public_body) |