diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-29 14:55:33 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-29 14:56:00 +0100 |
| commit | e57fa3d276d700ea21c97f8c2d3731f0f9d4c7ab (patch) | |
| tree | 1c9e555bde2d3b1a2007841f02ae62b3c3520b37 /spec/controllers/user_controller_spec.rb | |
| parent | 3084034493a428b2394a59b68921ed4b73a8cf7e (diff) | |
| parent | b4aefe5a69bbd492959931f1c577a028ec361993 (diff) | |
Attempt to merge current develop to theme
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
| -rw-r--r-- | spec/controllers/user_controller_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index c974c8a0d..438fb8c0c 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -179,7 +179,9 @@ describe UserController, "when signing up" do deliveries = ActionMailer::Base.deliveries deliveries.size.should == 1 - deliveries[0].body.should include("when you already have an") + + # This text may span a line break, depending on the length of the SITE_NAME + deliveries[0].body.should match(/when\s+you\s+already\s+have\s+an/) end # XXX need to do bob@localhost signup and check that sends different email |