Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 5 deletions

diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index fe04a1d7c4a..7b194ef8122 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/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