summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2016-07-07 18:39:45 -0500
committerPatricio Cano <suprnova32@gmail.com>2016-07-07 18:39:45 -0500
commitbe6c4fef40a937757a0e95ba758bf1b6da0155d7 (patch)
tree5e5539faeae7cacc3ab3dc2305903ff5d19dff6e
parent1867d0d505baf518fe92d3c306fddfb56e68a810 (diff)
downloadgitlab-ce-9127-link-report-to-profile.tar.gz
Removed unnecessary `id` from links and corrected tests to use the proper matcher.9127-link-report-to-profile
-rw-r--r--app/views/admin/abuse_reports/_abuse_report.html.haml2
-rw-r--r--app/views/users/show.html.haml2
-rw-r--r--spec/features/admin/admin_abuse_reports_spec.rb7
3 files changed, 5 insertions, 6 deletions
diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml
index b54ca059a61..dd2e7ebd030 100644
--- a/app/views/admin/abuse_reports/_abuse_report.html.haml
+++ b/app/views/admin/abuse_reports/_abuse_report.html.haml
@@ -3,7 +3,7 @@
%tr
%td
- if user
- = link_to user.name, user, id: 'abuser_profile_path'
+ = link_to user.name, user
.light.small
Joined #{time_ago_with_tooltip(user.created_at)}
- else
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 520f76eb062..db2b4885861 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -31,7 +31,7 @@
= icon('rss')
- if current_user.admin?
&nbsp;
- = 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
= icon('users')
diff --git a/spec/features/admin/admin_abuse_reports_spec.rb b/spec/features/admin/admin_abuse_reports_spec.rb
index 2ff02a1c9a8..16baf7e9516 100644
--- a/spec/features/admin/admin_abuse_reports_spec.rb
+++ b/spec/features/admin/admin_abuse_reports_spec.rb
@@ -6,16 +6,15 @@ describe "Admin::AbuseReports", feature: true, js: true do
context 'as an admin' do
describe 'if a user has been reported for abuse' do
before do
- admin = create(:admin)
create(:abuse_report, user: user)
- login_as admin
+ login_as :admin
end
describe 'in the abuse report view' do
it "should present a link to the user's profile" do
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
@@ -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
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