Merge branch...

Merge branch '332563-rename-usagepingcontroller-to-servicepingcontroller-and-refactor-fix-specs' into 'master'

Rename UsagePingController to ServicePingController and refactor/fix specs

See merge request gitlab-org/gitlab!64143

app/controllers/projects/usage_ping_controller.rb → app/controllers/projects/service_ping_controller.rb

 # frozen_string_literal: true
 
-class Projects::UsagePingController < Projects::ApplicationController
+class Projects::ServicePingController < Projects::ApplicationController
   before_action :authenticate_user!
 
   feature_category :usage_ping

config/routes/project.rb

@@ -547,7 +547,13 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
       end
 
-      scope :usage_ping, controller: :usage_ping do
+      # TODO: Deprecated. This should be removed in 14.2.
+      scope :usage_ping, controller: :service_ping do
+        post :web_ide_clientside_preview # rubocop:todo Cop/PutProjectRoutesUnderScope
+        post :web_ide_pipelines_count # rubocop:todo Cop/PutProjectRoutesUnderScope
+      end
+
+      scope :service_ping, controller: :service_ping do
         post :web_ide_clientside_preview # rubocop:todo Cop/PutProjectRoutesUnderScope
         post :web_ide_pipelines_count # rubocop:todo Cop/PutProjectRoutesUnderScope
       end

spec/controllers/projects/usage_ping_controller_spec.rb → spec/controllers/projects/service_ping_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::UsagePingController do
+RSpec.describe Projects::ServicePingController do
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 

spec/routing/project_routing_spec.rb

@@ -770,13 +770,23 @@ RSpec.describe 'project routing' do
     end
   end
 
-  describe Projects::UsagePingController, 'routing' do
-    it 'routes to usage_ping#web_ide_clientside_preview' do
-      expect(post('/gitlab/gitlabhq/usage_ping/web_ide_clientside_preview')).to route_to('projects/usage_ping#web_ide_clientside_preview', namespace_id: 'gitlab', project_id: 'gitlabhq')
+  describe Projects::ServicePingController, 'routing' do
+    describe 'deprecated routing' do
+      it 'routes to service_ping#web_ide_clientside_preview' do
+        expect(post('/gitlab/gitlabhq/usage_ping/web_ide_clientside_preview')).to route_to('projects/service_ping#web_ide_clientside_preview', namespace_id: 'gitlab', project_id: 'gitlabhq')
+      end
+
+      it 'routes to service_ping#web_ide_pipelines_count' do
+        expect(post('/gitlab/gitlabhq/usage_ping/web_ide_pipelines_count')).to route_to('projects/service_ping#web_ide_pipelines_count', namespace_id: 'gitlab', project_id: 'gitlabhq')
+      end
+    end
+
+    it 'routes to service_ping#web_ide_clientside_preview' do
+      expect(post('/gitlab/gitlabhq/service_ping/web_ide_clientside_preview')).to route_to('projects/service_ping#web_ide_clientside_preview', namespace_id: 'gitlab', project_id: 'gitlabhq')
     end
 
-    it 'routes to usage_ping#web_ide_pipelines_count' do
-      expect(post('/gitlab/gitlabhq/usage_ping/web_ide_pipelines_count')).to route_to('projects/usage_ping#web_ide_pipelines_count', namespace_id: 'gitlab', project_id: 'gitlabhq')
+    it 'routes to service_ping#web_ide_pipelines_count' do
+      expect(post('/gitlab/gitlabhq/service_ping/web_ide_pipelines_count')).to route_to('projects/service_ping#web_ide_pipelines_count', namespace_id: 'gitlab', project_id: 'gitlabhq')
     end
   end