summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2016-07-06 16:17:20 -0500
committerPatricio Cano <suprnova32@gmail.com>2016-07-06 16:17:20 -0500
commit1867d0d505baf518fe92d3c306fddfb56e68a810 (patch)
tree837a119048c78d473afc22da9b28acf91a25c59e
parent5c4a2bff91e7ad02a675e5d0ce1c27a36bc4bee6 (diff)
downloadgitlab-ce-1867d0d505baf518fe92d3c306fddfb56e68a810.tar.gz
Added specs to check for the correct links.
-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.rb31
3 files changed, 33 insertions, 2 deletions
diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml
index dd2e7ebd030..b54ca059a61 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
+ = link_to user.name, user, id: 'abuser_profile_path'
.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 db2b4885861..520f76eb062 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], class: 'btn btn-gray', title: 'View user in admin area',
+ = link_to [:admin, @user], id: 'admin_user_path', 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
new file mode 100644
index 00000000000..2ff02a1c9a8
--- /dev/null
+++ b/spec/features/admin/admin_abuse_reports_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe "Admin::AbuseReports", feature: true, js: true do
+ let(:user) { create(:user) }
+
+ 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
+ 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'
+ end
+ end
+
+ describe 'in the profile page of the user' 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'
+ end
+ end
+ end
+ end
+end