From 23c46c68abfae18e9aca19eb95941ecd1e74bb59 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Mon, 8 Feb 2010 17:53:52 +0000
Subject: [PATCH] Moved a routing test from a functional to an integration
test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3395 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
test/functional/reports_controller_test.rb | 12 ----------
test/integration/routing_test.rb | 26 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 12 deletions(-)
create mode 100644 test/integration/routing_test.rb
diff --git a/test/functional/reports_controller_test.rb b/test/functional/reports_controller_test.rb
index 4f99a0a81..d9ef4942a 100644
--- a/test/functional/reports_controller_test.rb
+++ b/test/functional/reports_controller_test.rb
@@ -32,18 +32,6 @@ class ReportsControllerTest < ActionController::TestCase
User.current = nil
end
- def test_issue_report_routing
- assert_routing(
- {:method => :get, :path => '/projects/567/issues/report'},
- :controller => 'reports', :action => 'issue_report', :id => '567'
- )
- assert_routing(
- {:method => :get, :path => '/projects/567/issues/report/assigned_to'},
- :controller => 'reports', :action => 'issue_report', :id => '567', :detail => 'assigned_to'
- )
-
- end
-
context "GET :issue_report without details" do
setup do
get :issue_report, :id => 1
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
new file mode 100644
index 000000000..dc3e32e8c
--- /dev/null
+++ b/test/integration/routing_test.rb
@@ -0,0 +1,26 @@
+# redMine - project management software
+# Copyright (C) 2006-2010 Jean-Philippe Lang
+#
+# 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.
+
+require "test_helper"
+
+class RoutingTest < ActionController::IntegrationTest
+ context "issue reports" do
+ should_route :get, "/projects/567/issues/report", :controller => 'reports', :action => 'issue_report', :id => '567'
+ should_route :get, "/projects/567/issues/report/assigned_to", :controller => 'reports', :action => 'issue_report', :id => '567', :detail => 'assigned_to'
+ end
+
+end
--
GitLab