Merge branch 'release/0.6'0.6

Conflicts:
	locale/bs/app.po
	locale/ca/app.po
	locale/cs/app.po
	locale/cy/app.po
	locale/de/app.po
	locale/en_IE/app.po
	locale/es/app.po
	locale/eu/app.po
	locale/fr/app.po
	locale/ga_IE/app.po
	locale/gl/app.po
	locale/hu_HU/app.po
	locale/id/app.po
	locale/pt_BR/app.po
	locale/sq/app.po
	locale/sr@latin/app.po
	spec/fixtures/locale/en/app.po

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/integration/search_request_spec.rb b/spec/integration/search_request_spec.rb
index b62f0a4c4..17a7b4aaa 100644
--- a/spec/integration/search_request_spec.rb
+++ b/spec/integration/search_request_spec.rb
@@ -12,6 +12,13 @@ describe "When searching" do
         response.body.should include(""mouse stilton"")
     end
 
+    it "should redirect requests with search in query string to URL-based page" do
+        url = '/search/all?query=bob'
+        request_via_redirect("post", url)
+        response.request.url.should_not include(url)
+        response.request.url.should include("/search/bob/all")
+    end
+
     it "should correctly execute simple search" do
         request_via_redirect("post", "/search",
                              :query => 'bob'