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
Jérome Perrin
gitlab-ce
Commits
be6c4fef
Commit
be6c4fef
authored
Jul 07, 2016
by
Patricio Cano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed unnecessary `id` from links and corrected tests to use the proper matcher.
parent
1867d0d5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
app/views/admin/abuse_reports/_abuse_report.html.haml
app/views/admin/abuse_reports/_abuse_report.html.haml
+1
-1
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-1
spec/features/admin/admin_abuse_reports_spec.rb
spec/features/admin/admin_abuse_reports_spec.rb
+3
-4
No files found.
app/views/admin/abuse_reports/_abuse_report.html.haml
View file @
be6c4fef
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
%tr
%tr
%td
%td
-
if
user
-
if
user
=
link_to
user
.
name
,
user
,
id:
'abuser_profile_path'
=
link_to
user
.
name
,
user
.light.small
.light.small
Joined
#{
time_ago_with_tooltip
(
user
.
created_at
)
}
Joined
#{
time_ago_with_tooltip
(
user
.
created_at
)
}
-
else
-
else
...
...
app/views/users/show.html.haml
View file @
be6c4fef
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
=
icon
(
'rss'
)
=
icon
(
'rss'
)
-
if
current_user
.
admin?
-
if
current_user
.
admin?
=
link_to
[
:admin
,
@user
],
id:
'admin_user_path'
,
class:
'btn btn-gray'
,
title:
'View user in admin area'
,
=
link_to
[
:admin
,
@user
],
class:
'btn btn-gray'
,
title:
'View user in admin area'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'users'
)
=
icon
(
'users'
)
...
...
spec/features/admin/admin_abuse_reports_spec.rb
View file @
be6c4fef
...
@@ -6,16 +6,15 @@ describe "Admin::AbuseReports", feature: true, js: true do
...
@@ -6,16 +6,15 @@ describe "Admin::AbuseReports", feature: true, js: true do
context
'as an admin'
do
context
'as an admin'
do
describe
'if a user has been reported for abuse'
do
describe
'if a user has been reported for abuse'
do
before
do
before
do
admin
=
create
(
:admin
)
create
(
:abuse_report
,
user:
user
)
create
(
:abuse_report
,
user:
user
)
login_as
admin
login_as
:
admin
end
end
describe
'in the abuse report view'
do
describe
'in the abuse report view'
do
it
"should present a link to the user's profile"
do
it
"should present a link to the user's profile"
do
visit
admin_abuse_reports_path
visit
admin_abuse_reports_path
expect
(
page
).
to
have_
selector
'#abuser_profile_path'
expect
(
page
).
to
have_
link
user
.
name
,
href:
user_path
(
user
)
end
end
end
end
...
@@ -23,7 +22,7 @@ describe "Admin::AbuseReports", feature: true, js: true do
...
@@ -23,7 +22,7 @@ describe "Admin::AbuseReports", feature: true, js: true do
it
'should show a link to the admin view of the user'
do
it
'should show a link to the admin view of the user'
do
visit
user_path
(
user
)
visit
user_path
(
user
)
expect
(
page
).
to
have_
selector
'#admin_user_path'
expect
(
page
).
to
have_
link
''
,
href:
admin_user_path
(
user
)
end
end
end
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