From: Tom Hughes <tom@compton.nu>
Date: Sat, 30 Nov 2013 12:36:47 +0000 (+0000)
Subject: Redirect /?query= to /search?query=
X-Git-Tag: live~4641
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/315d1dab540ad5c11e7a22201387327525578229

Redirect /?query= to /search?query=
---

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 1757e771a..5c391d7b2 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -97,6 +97,8 @@ class SiteController < ApplicationController
       redirect_to relation_path(params[:relation])
     elsif params[:note]
       redirect_to browse_note_path(params[:note])
+    elsif params[:query]
+      redirect_to search_path(:query => params[:query])
     end
   end
 
diff --git a/test/integration/redirect_test.rb b/test/integration/redirect_test.rb
index 42199ce4e..db28032f1 100644
--- a/test/integration/redirect_test.rb
+++ b/test/integration/redirect_test.rb
@@ -1,6 +1,12 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class RedirectTest  < ActionDispatch::IntegrationTest
+  def test_search_redirects
+    get "/?query=test"
+    assert_response :redirect
+    assert_redirected_to "/search?query=test"
+  end
+
   def test_history_redirects
     get "/browse"
     assert_response :redirect