summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-12-24 01:05:09 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-12-24 01:05:09 +0000
commitdd312d294a3c4106c46e5f8b879ff6e9bc65d138 (patch)
tree44e4392e105ee0024e6ae3c388ac5b776f9d8bdd
parentbb7854923d00580eb3d649fe05f72b8f67ee5f11 (diff)
downloadredmine-dd312d294a3c4106c46e5f8b879ff6e9bc65d138.tar.gz
redmine-dd312d294a3c4106c46e5f8b879ff6e9bc65d138.zip
test: route: move journals test in test_issues_extra_actions to new file
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8333 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/integration/routing/journals_test.rb31
-rw-r--r--test/integration/routing_test.rb8
2 files changed, 31 insertions, 8 deletions
diff --git a/test/integration/routing/journals_test.rb b/test/integration/routing/journals_test.rb
new file mode 100644
index 000000000..18a6c9911
--- /dev/null
+++ b/test/integration/routing/journals_test.rb
@@ -0,0 +1,31 @@
+# Redmine - project management software
+# Copyright (C) 2006-2011 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 File.expand_path('../../../test_helper', __FILE__)
+
+class RoutingJournalsTest < ActionController::IntegrationTest
+ def test_journals
+ assert_routing(
+ { :method => 'post', :path => "/issues/1/quoted" },
+ { :controller => 'journals', :action => 'new', :id => '1' }
+ )
+ assert_routing(
+ { :method => 'get', :path => "/issues/changes" },
+ { :controller => 'journals', :action => 'index' }
+ )
+ end
+end
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index ff3d126d9..90670daba 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -115,10 +115,6 @@ class RoutingTest < ActionController::IntegrationTest
:copy_from => '64' }
)
assert_routing(
- { :method => 'post', :path => "/issues/1/quoted" },
- { :controller => 'journals', :action => 'new', :id => '1' }
- )
- assert_routing(
{ :method => 'get', :path => "/issues/calendar" },
{ :controller => 'calendars', :action => 'show' }
)
@@ -166,10 +162,6 @@ class RoutingTest < ActionController::IntegrationTest
{ :controller => 'context_menus', :action => 'issues' }
)
assert_routing(
- { :method => 'get', :path => "/issues/changes" },
- { :controller => 'journals', :action => 'index' }
- )
- assert_routing(
{ :method => 'get', :path => "/issues/bulk_edit" },
{ :controller => 'issues', :action => 'bulk_edit' }
)