Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
1c517153
Commit
1c517153
authored
Feb 28, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix admin users tests
parent
9a5c152c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
app/views/notify/new_user_email.text.erb
app/views/notify/new_user_email.text.erb
+3
-1
spec/features/admin/admin_users_spec.rb
spec/features/admin/admin_users_spec.rb
+4
-4
No files found.
app/views/notify/new_user_email.text.erb
View file @
1c517153
...
...
@@ -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
)
%>
spec/features/admin/admin_users_spec.rb
View file @
1c517153
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment