From 20920bc1285e559f4b10dab8316049e753ece57e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 22 Apr 2020 16:31:18 +0300
Subject: [PATCH] Move global autocomplete routes to /-/ scope

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 .../dz-scope-autocomplete-routing.yml         |  5 +++
 config/routes.rb                              | 39 ++++++++++++-------
 spec/routing/routing_spec.rb                  | 24 ++++++++++++
 3 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 changelogs/unreleased/dz-scope-autocomplete-routing.yml

diff --git a/changelogs/unreleased/dz-scope-autocomplete-routing.yml b/changelogs/unreleased/dz-scope-autocomplete-routing.yml
new file mode 100644
index 00000000000000..73f9ab74292cb1
--- /dev/null
+++ b/changelogs/unreleased/dz-scope-autocomplete-routing.yml
@@ -0,0 +1,5 @@
+---
+title: Move global autocomplete routes to /-/ scope
+merge_request: 30173
+author:
+type: changed
diff --git a/config/routes.rb b/config/routes.rb
index 097814d90a7107..97be2a5e32abde 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,19 +44,6 @@
 
   use_doorkeeper_openid_connect
 
-  # Autocomplete
-  get '/autocomplete/users' => 'autocomplete#users'
-  get '/autocomplete/users/:id' => 'autocomplete#user'
-  get '/autocomplete/projects' => 'autocomplete#projects'
-  get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
-  get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches'
-
-  Gitlab.ee do
-    get '/autocomplete/project_groups' => 'autocomplete#project_groups'
-    get '/autocomplete/project_routes' => 'autocomplete#project_routes'
-    get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes'
-  end
-
   # Sign up
   get 'users/sign_up/welcome' => 'registrations#welcome'
   patch 'users/sign_up/update_registration' => 'registrations#update_registration'
@@ -75,6 +62,19 @@
   # Begin of the /-/ scope.
   # Use this scope for all new global routes.
   scope path: '-' do
+    # Autocomplete
+    get '/autocomplete/users' => 'autocomplete#users'
+    get '/autocomplete/users/:id' => 'autocomplete#user'
+    get '/autocomplete/projects' => 'autocomplete#projects'
+    get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
+    get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches'
+
+    Gitlab.ee do
+      get '/autocomplete/project_groups' => 'autocomplete#project_groups'
+      get '/autocomplete/project_routes' => 'autocomplete#project_routes'
+      get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes'
+    end
+
     # '/-/health' implemented by BasicHealthCheck middleware
     get 'liveness' => 'health#liveness'
     get 'readiness' => 'health#readiness'
@@ -199,6 +199,19 @@
   # Deprecated routes.
   # Will be removed as part of https://gitlab.com/gitlab-org/gitlab/-/issues/210024
   scope as: :deprecated do
+    # Autocomplete
+    get '/autocomplete/users' => 'autocomplete#users'
+    get '/autocomplete/users/:id' => 'autocomplete#user'
+    get '/autocomplete/projects' => 'autocomplete#projects'
+    get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
+    get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches'
+
+    Gitlab.ee do
+      get '/autocomplete/project_groups' => 'autocomplete#project_groups'
+      get '/autocomplete/project_routes' => 'autocomplete#project_routes'
+      get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes'
+    end
+
     resources :invites, only: [:show], constraints: { id: /[A-Za-z0-9_-]+/ } do
       member do
         post :accept
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 61599f0876f609..9c3d17f7d8fc72 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -344,3 +344,27 @@
       .to route_to('sent_notifications#unsubscribe', id: '4bee17d4a63ed60cf5db53417e9aeb4c')
   end
 end
+
+describe AutocompleteController, 'routing' do
+  it 'to #users' do
+    expect(get("/-/autocomplete/users")).to route_to('autocomplete#users')
+  end
+
+  it 'to #projects' do
+    expect(get("/-/autocomplete/projects")).to route_to('autocomplete#projects')
+  end
+
+  it 'to #award_emojis' do
+    expect(get("/-/autocomplete/award_emojis")).to route_to('autocomplete#award_emojis')
+  end
+
+  it 'to #merge_request_target_branches' do
+    expect(get("/-/autocomplete/merge_request_target_branches")).to route_to('autocomplete#merge_request_target_branches')
+  end
+
+  it 'to legacy route' do
+    expect(get("/autocomplete/users")).to route_to('autocomplete#users')
+    expect(get("/autocomplete/projects")).to route_to('autocomplete#projects')
+    expect(get("/autocomplete/award_emojis")).to route_to('autocomplete#award_emojis')
+  end
+end
-- 
GitLab