Merge branch 'vs-change-labels-to-billable-users' into 'master'

Change labels Active Users to Billable Users in EE

Closes #233823

See merge request gitlab-org/gitlab!42638

app/views/admin/dashboard/_billable_users_text.html.haml

+= s_('AdminArea|Active users')

app/views/admin/dashboard/stats.html.haml

@@ -50,11 +50,9 @@
       = s_('AdminArea|Bots')
     %td.p-3.text-right
       = @users_statistics&.bots.to_i
-
   %tr.bg-gray-light.gl-text-gray-900
     %td.p-3
       %strong
-        = s_('AdminArea|Active users')
         = render_if_exists 'admin/dashboard/billable_users_text'
     %td.p-3.text-right
       %strong

ee/app/views/admin/dashboard/_billable_users_text.html.haml

-- if License.current&.paid?
-  = "(#{s_('AdminArea|Billable users')})"
+= s_('AdminArea|Billable users')

ee/app/views/admin/licenses/_breakdown.html.haml

@@ -53,7 +53,7 @@
       .info-well.dark-well.gl-mb-0
         .well-segment.well-centered
           %h3.center
-            = _('Active Users:')
+            = _('Billable Users:')
             = number_with_delimiter current_active_user_count
           %hr
             %p

ee/app/views/admin/licenses/_license_history.html.haml

@@ -12,7 +12,7 @@
         %th= _('Uploaded on')
         %th= _('Valid from')
         %th= _('Expires on')
-        %th= _('Active users')
+        %th= _('Users in License')
     %tbody
       - @licenses.each do |license|
         %tr{ class: ('gl-bg-blue-50 font-weight-bold gl-text-blue-500' if license == @license), data: { testid: ('license-current' if license == @license) } }

ee/changelogs/unreleased/vs-change-labels-to-billable-users.yml

+---
+title: Rename Active Users to Billable Users
+merge_request: 42638
+author:
+type: added

ee/spec/features/admin/admin_dashboard_spec.rb

@@ -64,9 +64,9 @@ RSpec.describe 'Admin Dashboard' do
       expect(page).to have_content("Users with highest role Maintainer 6")
       expect(page).to have_content("Users with highest role Owner 5")
       expect(page).to have_content("Bots 2")
-      expect(page).to have_content("Active users (Billable users) 71")
       expect(page).to have_content("Blocked users 7")
       expect(page).to have_content("Total users 78")
+      expect(page).to have_content("Billable users 71")
     end
   end
 end

ee/spec/views/admin/dashboard/index.html.haml_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe 'admin/dashboard/index.html.haml' do
       render
 
       expect(rendered).to have_content "Users in License:"
-      expect(rendered).to have_content "Active Users"
+      expect(rendered).to have_content "Billable Users"
       expect(rendered).to have_content "Maximum Users"
       expect(rendered).to have_content "Users over License"
     end

locale/gitlab.pot

@@ -1465,12 +1465,6 @@ msgstr ""
 msgid "Active Sessions"
 msgstr ""
 
-msgid "Active Users:"
-msgstr ""
-
-msgid "Active users"
-msgstr ""
-
 msgid "Activity"
 msgstr ""
 
@@ -3982,6 +3976,9 @@ msgstr ""
 msgid "Bi-weekly code coverage"
 msgstr ""
 
+msgid "Billable Users:"
+msgstr ""
+
 msgid "Billing"
 msgstr ""
 
@@ -27983,6 +27980,9 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+msgid "Users in License"
+msgstr ""
+
 msgid "Users in License:"
 msgstr ""
 

spec/features/admin/dashboard_spec.rb

@@ -28,11 +28,9 @@ RSpec.describe 'admin visits dashboard' do
 
   describe 'Users statistic' do
     let_it_be(:users_statistics) { create(:users_statistics) }
+    let_it_be(:users_count_label) { Gitlab.ee? ? 'Billable users 71' : 'Active users 71' }
 
     it 'shows correct amounts of users', :aggregate_failures do
-      expected_active_users_text = Gitlab.ee? ? 'Active users (Billable users) 71' : 'Active users 71'
-
-      sign_in(create(:admin))
       visit admin_dashboard_stats_path
 
       expect(page).to have_content('Users without a Group and Project 23')
@@ -42,9 +40,9 @@ RSpec.describe 'admin visits dashboard' do
       expect(page).to have_content('Users with highest role Maintainer 6')
       expect(page).to have_content('Users with highest role Owner 5')
       expect(page).to have_content('Bots 2')
-      expect(page).to have_content(expected_active_users_text)
       expect(page).to have_content('Blocked users 7')
       expect(page).to have_content('Total users 78')
+      expect(page).to have_content(users_count_label)
     end
   end
 end

spec/views/admin/dashboard/index.html.haml_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe 'admin/dashboard/index.html.haml' do
     render
 
     expect(rendered).not_to have_content "Users in License"
-    expect(rendered).not_to have_content "Active Users"
+    expect(rendered).not_to have_content "Billable Users"
     expect(rendered).not_to have_content "Maximum Users"
     expect(rendered).not_to have_content "Users over License"
   end