diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-12-12 18:05:13 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-12-12 18:05:13 +0000 |
| commit | f9b6e57d24be6db2aaf7c2f7131d245d205acb0d (patch) | |
| tree | 40674fdca695158a5cf6d5a24941b55864abc4a6 | |
| parent | f1994ea9c0820fa3efdb55dde62efd107a3f2fb6 (diff) | |
| download | redmine-f9b6e57d24be6db2aaf7c2f7131d245d205acb0d.tar.gz redmine-f9b6e57d24be6db2aaf7c2f7131d245d205acb0d.zip | |
Fixed error on project creation due to unrecognized route.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8192 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | test/integration/routing_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 189220dca..e934f7878 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -29,7 +29,7 @@ class ProjectsController < ApplicationController after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller| if controller.request.post? - controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt' + controller.send :expire_action, :controller => 'welcome', :action => 'robots' end end diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 2119c5bc2..8309a831f 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -415,6 +415,10 @@ class RoutingTest < ActionController::IntegrationTest should_route :post, "/versions/1/status_by", :controller => 'versions', :action => 'status_by', :id => '1' end + context "welcome" do + should_route :get, "/robots.txt", :controller => 'welcome', :action => 'robots' + end + context "wiki (singular, project's pages)" do should_route :get, "/projects/567/wiki", :controller => 'wiki', :action => 'show', :project_id => '567' should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'show', :project_id => '567', :id => 'lalala' |