diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-06-23 09:33:42 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-06-23 09:33:42 +0100 |
| commit | db1a388f0a7b37cc0ceb3ca07b995b34dabdba58 (patch) | |
| tree | e34df5ae0dacdbf6c3b77542b22f2d9e3799d322 /spec/controllers/user_controller_spec.rb | |
| parent | a7cc84b9b2b430644fe23e6328d7ab289e7abf0a (diff) | |
| parent | 7d0fea4b38c214a67b2fc4b56aa670e02a3cda61 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Conflicts:
Gemfile.lock
script/handle-mail-replies
script/handle-mail-replies.rb
spec/controllers/request_controller_spec.rb
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
| -rw-r--r-- | spec/controllers/user_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 7a6c9ac0d..32398c053 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -265,7 +265,7 @@ describe UserController, "when signing up" do deliveries = ActionMailer::Base.deliveries deliveries.size.should == 1 - deliveries[0].body.should include("No revelaremos su dirección de correo") + deliveries[0].body.should include("No revelaremos") end it "should send special 'already signed up' mail if you fill the form in with existing registered email" do |