Merge ca5eb51 into 66d97c0

config/routes.rb

@@ -872,8 +872,8 @@ def matches?(request)
       end
     end
 
-    namespace :alaveteli_pro do
-      root to: 'dashboard#index', :as => :dashboard, :via => :get
+    namespace :alaveteli_pro, path: 'pro' do
+      get :dashboard, to: 'dashboard#index'
       resources :draft_info_requests, :only => [:create, :update]
       resources :info_requests, only: [:new, :create, :index] do
         get :preview, on: :new # /info_request/new/preview
@@ -906,7 +906,7 @@ def matches?(request)
       resources :public_bodies, :only => [:index]
     end
 
-    scope path: :alaveteli_pro do
+    scope path: :pro do
       # So that we can show a batch request using the existing controller from
       # the pro context
       match '/info_request_batches/:id' => 'info_request_batch#show',

config/routes/redirects.rb

@@ -100,4 +100,8 @@
   get '/alaveteli_pro/info_requests/:url_title',
     constraints: { url_title: /(?!new).*/ },
     to: redirect('/request/%{url_title}')
+
+  get '/alaveteli_pro', to: redirect('/pro/dashboard')
+
+  get '/alaveteli_pro/*path', to: redirect('/pro/%{path}')
 end

doc/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Highlighted Features
 
+* Update `/alaveteli_pro` base path to `/pro` (Alexander Griffen, Graeme
+  Porteous)
 * Change use of `/alaveteli_pro/info_requests/{request}` to instead appear as
   `/request/{request}` (Alexander Griffen, Graeme Porteous)
 * Remove locale prefixes from URLs (Alexander Griffen, Graeme Porteous)

spec/controllers/alaveteli_pro/batch_request_authority_searches_controller_spec.rb

@@ -139,7 +139,7 @@
     it 'redirects to index action' do
       get :new
       expect(response).to redirect_to(
-        '/alaveteli_pro/batch_request_authority_searches'
+        '/pro/batch_request_authority_searches'
       )
     end
   end

spec/routing/redirects_spec.rb

@@ -95,4 +95,18 @@
     get('/alaveteli_pro/info_requests/new')
     expect(response).to_not redirect_to('/request/new')
   end
+
+  it 'redirects from alaveteli_pro urls to pro urls', feature: :alaveteli_pro do
+    get('/alaveteli_pro')
+    expect(response).to redirect_to('/pro/dashboard')
+
+    get('/alaveteli_pro/pricing')
+    expect(response).to redirect_to('/pro/pricing')
+
+    get('/alaveteli_pro/embargoes')
+    expect(response).to redirect_to('/pro/embargoes')
+
+    get('/alaveteli_pro/embargoes/1')
+    expect(response).to redirect_to('/pro/embargoes/1')
+  end
 end

spec/views/alaveteli_pro/info_requests/new.html.erb_spec.rb

@@ -36,7 +36,7 @@ def assign_variables
     assign_variables
     render
     expect(rendered).
-      to match(/data-search-url="\/alaveteli_pro\/public_bodies"/)
+      to match(/data-search-url="\/pro\/public_bodies"/)
   end
 
   it "includes a hidden field for the body id" do