summaryrefslogtreecommitdiff
path: root/spec/features/admin
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-05-30 07:44:03 +0000
committerRémy Coutable <remy@rymai.me>2017-05-30 07:44:03 +0000
commit1d8de967a1ef9235891ab5a6b9a654280f8a5cbf (patch)
treec7a152660179e32cb0eb85c232c7d9f1ebd6eb96 /spec/features/admin
parent77ba9a547bb9fb000a2381d945a3e1b74706cec9 (diff)
parentf547a473d80288757d8ce8d8d7ba11df616b691d (diff)
downloadgitlab-ce-1d8de967a1ef9235891ab5a6b9a654280f8a5cbf.tar.gz
Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'
31616-add-uptime-of-gitlab-instance-in-admin-area Closes #31616 See merge request !11590
Diffstat (limited to 'spec/features/admin')
-rw-r--r--spec/features/admin/admin_system_info_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/features/admin/admin_system_info_spec.rb b/spec/features/admin/admin_system_info_spec.rb
index 1df972843e2..15482347886 100644
--- a/spec/features/admin/admin_system_info_spec.rb
+++ b/spec/features/admin/admin_system_info_spec.rb
@@ -20,6 +20,7 @@ describe 'Admin System Info' do
expect(page).to have_content 'CPU 2 cores'
expect(page).to have_content 'Memory 4 GB / 16 GB'
expect(page).to have_content 'Disks'
+ expect(page).to have_content 'Uptime'
end
end
@@ -34,6 +35,7 @@ describe 'Admin System Info' do
expect(page).to have_content 'CPU Unable to collect CPU info'
expect(page).to have_content 'Memory 4 GB / 16 GB'
expect(page).to have_content 'Disks'
+ expect(page).to have_content 'Uptime'
end
end
@@ -48,6 +50,7 @@ describe 'Admin System Info' do
expect(page).to have_content 'CPU 2 cores'
expect(page).to have_content 'Memory Unable to collect memory info'
expect(page).to have_content 'Disks'
+ expect(page).to have_content 'Uptime'
end
end
end