From fead8a35fde2f9a6b7e47cf2639aef2af39b781c Mon Sep 17 00:00:00 2001
From: Christian Ratz <c.ratz@finn.de>
Date: Wed, 12 Mar 2014 11:22:06 +0100
Subject: [PATCH] Fixed short uri for wp

---
 config/routes.rb                   |  2 +-
 spec/requests/short_uri_wp_spec.rb | 48 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 spec/requests/short_uri_wp_spec.rb

diff --git a/config/routes.rb b/config/routes.rb
index 246b814bb9..afda3b842d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,7 +40,7 @@ OpenProject::Application.routes.draw do
   match '/issues/*rest' => redirect { |params, req| "#{rails_relative_url_root}/work_packages/#{URI.escape(params[:rest])}" }
 
   # Redirect wp short url for work packages to full URL
-  match '/wp(/)'    => redirect('#{rails_relative_url_root}/work_packages/')
+  match '/wp(/)'    => redirect("#{rails_relative_url_root}/work_packages/")
   match '/wp/*rest' => redirect { |params, req| "#{rails_relative_url_root}/work_packages/#{URI.escape(params[:rest])}" }
 
   scope :controller => 'account' do
diff --git a/spec/requests/short_uri_wp_spec.rb b/spec/requests/short_uri_wp_spec.rb
new file mode 100644
index 0000000000..f7edede41c
--- /dev/null
+++ b/spec/requests/short_uri_wp_spec.rb
@@ -0,0 +1,48 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+
+describe "routes for old issue uris" do
+  describe "for index action" do
+    before do
+      get("/wp")
+    end
+
+    it { response.should redirect_to("/work_packages/") }
+  end
+
+  describe "with specific id" do
+    before do
+      get("/wp/1234")
+    end
+
+    it { response.should redirect_to("/work_packages/1234") }
+  end
+end
+