BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d12c1e90
Commit
d12c1e90
authored
Jun 23, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Test secondary user email removal.
parent
37425618
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
1 deletion
+28
-1
show.html.haml
app/views/admin/users/show.html.haml
+1
-1
users.feature
features/admin/users.feature
+8
-0
users.rb
features/steps/admin/users.rb
+19
-0
No files found.
app/views/admin/users/show.html.haml
View file @
d12c1e90
...
...
@@ -44,7 +44,7 @@
%li
%span
.light
Secondary email:
%strong
=
email
.
email
=
link_to
remove_email_admin_user_path
(
@user
,
email
),
data:
{
confirm:
"Are you sure you want to remove
#{
email
.
email
}
?"
},
method: :delete
,
class:
"btn-tiny btn btn-remove pull-right"
,
title:
'Remove secondary email'
do
=
link_to
remove_email_admin_user_path
(
@user
,
email
),
data:
{
confirm:
"Are you sure you want to remove
#{
email
.
email
}
?"
},
method: :delete
,
class:
"btn-tiny btn btn-remove pull-right"
,
title:
'Remove secondary email'
,
id:
"remove_email_
#{
email
.
id
}
"
do
%i
.icon-remove
%li
...
...
features/admin/users.feature
View file @
d12c1e90
...
...
@@ -21,3 +21,11 @@ Feature: Admin Users
And
click edit on my user
When
I submit modified user
Then
I see user attributes changed
@javascript
Scenario
:
Remove users secondary email
Given
I visit admin users page
And
I view the user with secondary email
And
I see the secondary email
When
I click remove secondary email
Then
I should not see secondary email anymore
features/steps/admin/users.rb
View file @
d12c1e90
...
...
@@ -44,4 +44,23 @@ class AdminUsers < Spinach::FeatureSteps
step
'click edit on my user'
do
find
(
"#edit_user_
#{
current_user
.
id
}
"
).
click
end
step
'I view the user with secondary email'
do
@user_with_secondary_email
=
User
.
last
@user_with_secondary_email
.
emails
.
new
(
email:
"secondary@example.com"
)
@user_with_secondary_email
.
save
visit
"/admin/users/
#{
@user_with_secondary_email
.
username
}
"
end
step
'I see the secondary email'
do
page
.
should
have_content
"Secondary email:
#{
@user_with_secondary_email
.
emails
.
last
.
email
}
"
end
step
'I click remove secondary email'
do
find
(
"#remove_email_
#{
@user_with_secondary_email
.
emails
.
last
.
id
}
"
).
click
end
step
'I should not see secondary email anymore'
do
page
.
should_not
have_content
"Secondary email:"
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