Merge branch '38145_ux_issues_in_system_info_page' into 'master'

app/views/admin/system_info/show.html.haml

@@ -15,7 +15,7 @@
             Unable to collect CPU info
     .col-sm-4
       .light-well
-        %h4 Memory
+        %h4 Memory Usage
         .data
           - if @memory
             %h1 #{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)}
@@ -24,7 +24,7 @@
             Unable to collect memory info
     .col-sm-4
       .light-well
-        %h4 Disks
+        %h4 Disk Usage
         .data
           - @disks.each do |disk|
             %h1 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}
@@ -34,4 +34,4 @@
       .light-well
         %h4 Uptime
         .data
-          %h1= time_ago_with_tooltip(Rails.application.config.booted_at)
+          %h1= distance_of_time_in_words_to_now(Rails.application.config.booted_at)

changelogs/unreleased/38145_ux_issues_in_system_info_page.yml

+---
+title: Fixes the wording of headers in system info page
+merge_request: 15802
+author: Gilbert Roulot
+type: fixed

spec/features/admin/admin_system_info_spec.rb

@@ -18,8 +18,8 @@ describe 'Admin System Info' do
 
       it 'shows system info page' 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 'Memory Usage 4 GB / 16 GB'
+        expect(page).to have_content 'Disk Usage'
         expect(page).to have_content 'Uptime'
       end
     end
@@ -33,8 +33,8 @@ describe 'Admin System Info' do
 
       it 'shows system info page with no CPU 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 'Memory Usage 4 GB / 16 GB'
+        expect(page).to have_content 'Disk Usage'
         expect(page).to have_content 'Uptime'
       end
     end
@@ -48,8 +48,8 @@ describe 'Admin System Info' do
 
       it 'shows system info page with no CPU 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 'Memory Usage Unable to collect memory info'
+        expect(page).to have_content 'Disk Usage'
         expect(page).to have_content 'Uptime'
       end
     end