Merge branch 'al-233444-display-current-counts' into 'master'

Return stored seat counts in the subscriptions API endpoint

See merge request gitlab-org/gitlab!42293

ee/changelogs/unreleased/al-233444-display-current-counts.yml

+---
+title: Return stored seat counts in the subscriptions API endpoint
+merge_request: 42293
+author:
+type: fixed

ee/lib/ee/api/entities/gitlab_subscription.rb

@@ -14,9 +14,9 @@ module EE
 
         expose :usage do
           expose :seats, as: :seats_in_subscription
-          expose :calculate_seats_in_use, as: :seats_in_use
+          expose :seats_in_use
           expose :max_seats_used
-          expose :calculate_seats_owed, as: :seats_owed
+          expose :seats_owed
         end
 
         expose :billing do

ee/spec/requests/api/namespaces_spec.rb

@@ -285,7 +285,7 @@ RSpec.describe API::Namespaces do
     end
 
     context 'when authenticated as a regular user' do
-      it 'returns an unauthroized error' do
+      it 'returns an unauthorized error' do
         do_post(user, params)
 
         expect(response).to have_gitlab_http_status(:forbidden)
@@ -347,7 +347,7 @@ RSpec.describe API::Namespaces do
     end
 
     context 'with a regular user' do
-      it 'returns an unauthroized error' do
+      it 'returns an unauthorized error' do
         do_get(developer)
 
         expect(response).to have_gitlab_http_status(:forbidden)
@@ -401,7 +401,7 @@ RSpec.describe API::Namespaces do
     end
 
     context 'when authenticated as a regular user' do
-      it 'returns an unauthroized error' do
+      it 'returns an unauthorized error' do
         do_put(namespace.id, user, { seats: 150 })
 
         expect(response).to have_gitlab_http_status(:forbidden)