summaryrefslogtreecommitdiffstats
path: root/test/integration/routing_test.rb
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-10-05 16:07:17 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-10-05 16:07:17 +0000
commite13790c62c800a5b6d9528b5e2db2aad2c5e3710 (patch)
tree7be0ed076c62d3267a0f7839e07a6fcec011e533 /test/integration/routing_test.rb
parenta034172b24cde31bac0f18b842db8c76cfb80bb1 (diff)
downloadredmine-e13790c62c800a5b6d9528b5e2db2aad2c5e3710.tar.gz
redmine-e13790c62c800a5b6d9528b5e2db2aad2c5e3710.zip
Refactor: extract TimelogController#report to a new controller class
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4232 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration/routing_test.rb')
-rw-r--r--test/integration/routing_test.rb13
1 files changed, 9 insertions, 4 deletions
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index b42468ffb..d1a2aa390 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -226,9 +226,15 @@ class RoutingTest < ActionController::IntegrationTest
should_route :get, "/projects/ecookbook/time_entries/new", :controller => 'timelog', :action => 'edit', :project_id => 'ecookbook'
should_route :get, "/projects/ecookbook/issues/567/time_entries/new", :controller => 'timelog', :action => 'edit', :project_id => 'ecookbook', :issue_id => '567'
should_route :get, "/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22'
- should_route :get, "/time_entries/report", :controller => 'timelog', :action => 'report'
- should_route :get, "/projects/567/time_entries/report", :controller => 'timelog', :action => 'report', :project_id => '567'
- should_route :get, "/projects/567/time_entries/report.csv", :controller => 'timelog', :action => 'report', :project_id => '567', :format => 'csv'
+
+ should_route :post, "/time_entries/55/destroy", :controller => 'timelog', :action => 'destroy', :id => '55'
+ end
+
+ context "time_entry_reports" do
+ should_route :get, "/time_entries/report", :controller => 'time_entry_reports', :action => 'report'
+ should_route :get, "/projects/567/time_entries/report", :controller => 'time_entry_reports', :action => 'report', :project_id => '567'
+ should_route :get, "/projects/567/time_entries/report.csv", :controller => 'time_entry_reports', :action => 'report', :project_id => '567', :format => 'csv'
+
should_route :get, "/time_entries", :controller => 'timelog', :action => 'details'
should_route :get, "/time_entries.csv", :controller => 'timelog', :action => 'details', :format => 'csv'
should_route :get, "/time_entries.atom", :controller => 'timelog', :action => 'details', :format => 'atom'
@@ -240,7 +246,6 @@ class RoutingTest < ActionController::IntegrationTest
should_route :get, "/issues/234/time_entries.atom", :controller => 'timelog', :action => 'details', :issue_id => '234', :format => 'atom'
should_route :get, "/projects/ecookbook/issues/123/time_entries", :controller => 'timelog', :action => 'details', :project_id => 'ecookbook', :issue_id => '123'
- should_route :post, "/time_entries/55/destroy", :controller => 'timelog', :action => 'destroy', :id => '55'
end
context "users" do