deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix admin users tests

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-28 19:56:16 +02:00
parent 9a5c152c0e
commit 1c517153a8
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/notify/new_user_email.text.erb
View file

@ -3,6 +3,8 @@ Hi <%= @user.name %>!
Administrator created account for you. Now you are a member of company GitLab application. Administrator created account for you. Now you are a member of company GitLab application.
login.................. <%= @user.email %> login.................. <%= @user.email %>
password............... <%= @password %> <% unless Gitlab.config.gitlab.signup_enabled %>
password............... <%= @password %>
<% end %>
Click here to login: <%= url_for(root_url) %> Click here to login: <%= url_for(root_url) %>

8
spec/features/admin/admin_users_spec.rb
View file

@ -55,8 +55,8 @@ describe "Admin::Users" do
user = User.last user = User.last
email = ActionMailer::Base.deliveries.last email = ActionMailer::Base.deliveries.last
email.subject.should have_content("Account was created") email.subject.should have_content("Account was created")
email.body.should have_content(user.email) email.text_part.body.should have_content(user.email)
email.body.should have_content(@password) email.text_part.body.should have_content(@password)
end end
end end
@ -67,8 +67,8 @@ describe "Admin::Users" do
user = User.last user = User.last
email = ActionMailer::Base.deliveries.last email = ActionMailer::Base.deliveries.last
email.subject.should have_content("Account was created") email.subject.should have_content("Account was created")
email.body.should have_content(user.email) email.text_part.body.should have_content(user.email)
email.body.should_not have_content(@password) email.text_part.body.should_not have_content(@password)
end end
end end
end end