diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-03-25 15:20:59 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-03-25 15:20:59 +0000 |
| commit | 2bb79f893805e972f6efe5cb7cfe90dd0efa4107 (patch) | |
| tree | 47084acc8d48126b9e891bb50c217be43be27641 /spec/models | |
| parent | 22c25e42847d41924d43d31f3ef67be1ae4a155e (diff) | |
| parent | 1fb57d66c22000d4164c033ffd9353aa9030255b (diff) | |
resolve merge conflicts
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/outgoing_mailer_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/xapian_spec.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/models/outgoing_mailer_spec.rb b/spec/models/outgoing_mailer_spec.rb index e86f5635c..71a46f8f8 100644 --- a/spec/models/outgoing_mailer_spec.rb +++ b/spec/models/outgoing_mailer_spec.rb @@ -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/xapian_spec.rb b/spec/models/xapian_spec.rb index 36836d95b..00a88be99 100644 --- a/spec/models/xapian_spec.rb +++ b/spec/models/xapian_spec.rb @@ -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) |