diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-28 21:56:16 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-28 21:56:36 +0400 |
commit | 1c517153a889f77f0a2c321ce4e013f4504253e9 (patch) | |
tree | c5ba3f11af8f7b23baa922bce736059e3687b995 | |
parent | 9a5c152c0eaac36f91b073e99ff1235c4467933b (diff) |
fix admin users tests
-rw-r--r-- | app/views/notify/new_user_email.text.erb | 4 | ||||
-rw-r--r-- | spec/features/admin/admin_users_spec.rb | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/views/notify/new_user_email.text.erb b/app/views/notify/new_user_email.text.erb index 794d5a2c3e8..94072d7fe5c 100644 --- a/app/views/notify/new_user_email.text.erb +++ b/app/views/notify/new_user_email.text.erb @@ -3,6 +3,8 @@ Hi <%= @user.name %>! Administrator created account for you. Now you are a member of company GitLab application. login.................. <%= @user.email %> -password............... <%= @password %> +<% unless Gitlab.config.gitlab.signup_enabled %> + password............... <%= @password %> +<% end %> Click here to login: <%= url_for(root_url) %> diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index 77d6e9e3795..22d1ee91480 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -55,8 +55,8 @@ describe "Admin::Users" do user = User.last email = ActionMailer::Base.deliveries.last email.subject.should have_content("Account was created") - email.body.should have_content(user.email) - email.body.should have_content(@password) + email.text_part.body.should have_content(user.email) + email.text_part.body.should have_content(@password) end end @@ -67,8 +67,8 @@ describe "Admin::Users" do user = User.last email = ActionMailer::Base.deliveries.last email.subject.should have_content("Account was created") - email.body.should have_content(user.email) - email.body.should_not have_content(@password) + email.text_part.body.should have_content(user.email) + email.text_part.body.should_not have_content(@password) end end end |