diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-26 10:42:23 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-26 10:42:23 +0100 |
commit | 8bb2a357105f98174421d515cff82b706af3d4c8 (patch) | |
tree | 0ef4ef1b0bf76796f101c6f99c6a8104d63ff3b2 /spec/controllers/user_controller_spec.rb | |
parent | 0c321987194b3ef089e32f61cdac351d6b44e8c4 (diff) | |
parent | 9c79aba6bcf304a2ab3e6fbb2e649812aae1ecbb (diff) |
Merge branch 'develop' into feature/more-filter-and-search-options
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 |