Merge branch '300321_fix_billable_user_count_for_trial_ultimate_license' into 'master'

Exclude guests for trial ultimate licenses too

See merge request gitlab-org/gitlab!54952

ee/app/models/ee/user.rb

@@ -157,10 +157,7 @@ module EE
 
       def billable
         scope = active.without_bots
-
-        License.with_valid_license do |license|
-          scope = scope.excluding_guests if license.exclude_guests_from_active_count?
-        end
+        scope = scope.excluding_guests if License.current&.exclude_guests_from_active_count?
 
         scope
       end

ee/changelogs/unreleased/300321_fix_billable_user_count_for_trial_ultimate_license.yml

+---
+title: Exclude guests for trial ultimate licenses too
+merge_request: 54952
+author:
+type: fixed

ee/spec/models/ee/user_spec.rb

@@ -642,7 +642,7 @@ RSpec.describe User do
 
     context 'without guests' do
       before do
-        license = double('License', exclude_guests_from_active_count?: true, trial?: false)
+        license = double('License', exclude_guests_from_active_count?: true)
         allow(License).to receive(:current) { license }
       end