Merge branch 'tpresa-user-without-project-license-seat' into 'master'

Users without projects use a license seat in a non-premium license

Closes #196531

See merge request gitlab-org/gitlab!20664

changelogs/unreleased/tpresa-user-without-project-license-seat.yml

+---
+title: Users without projects use a license seat in a non-premium license
+merge_request: 20664
+author:
+type: fixed

ee/app/models/ee/user.rb

@@ -279,7 +279,7 @@ module EE
       if License.current&.exclude_guests_from_active_count?
         highest_role > ::Gitlab::Access::GUEST
       else
-        highest_role > ::Gitlab::Access::NO_ACCESS
+        true
       end
     end
 

ee/spec/models/user_spec.rb

@@ -626,9 +626,9 @@ describe User do
     end
 
     context 'when user is active' do
-      let(:project_guest_user) { create(:project_member, :guest).user }
-
       context 'user is guest' do
+        let(:project_guest_user) { create(:project_member, :guest).user }
+
         it 'returns false if license is ultimate' do
           create(:license, plan: License::ULTIMATE_PLAN)
 
@@ -641,6 +641,22 @@ describe User do
           expect(project_guest_user.using_license_seat?).to eq true
         end
       end
+
+      context 'user is admin without projects' do
+        let(:user) { create(:user, admin: true) }
+
+        it 'returns false if license is ultimate' do
+          create(:license, plan: License::ULTIMATE_PLAN)
+
+          expect(user.using_license_seat?).to eq false
+        end
+
+        it 'returns true if license is not ultimate' do
+          create(:license, plan: License::STARTER_PLAN)
+
+          expect(user.using_license_seat?).to eq true
+        end
+      end
     end
   end