Use should_route in routing tests.

git-svn-id: http://svn.redmine.org/redmine/trunk@13608 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 10 insertions, 19 deletions

diff --git a/test/integration/routing/activities_test.rb b/test/integration/routing/activities_test.rb
index d5b543f40..6212e31a8 100644
--- a/test/integration/routing/activities_test.rb
+++ b/test/integration/routing/activities_test.rb
@@ -17,24 +17,15 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class RoutingActivitiesTest < ActionDispatch::IntegrationTest
-  def test_activities
-    assert_routing(
-           { :method => 'get', :path => "/activity" },
-           { :controller => 'activities', :action => 'index' }
-        )
-    assert_routing(
-           { :method => 'get', :path => "/activity.atom" },
-           { :controller => 'activities', :action => 'index', :format => 'atom' }
-        )
-    assert_routing(
-        { :method => 'get', :path => "/projects/33/activity" },
-        { :controller => 'activities', :action => 'index', :id => '33' }
-      )
-    assert_routing(
-        { :method => 'get', :path => "/projects/33/activity.atom" },
-        { :controller => 'activities', :action => 'index', :id => '33',
-          :format => 'atom' }
-      )
+class RoutingActivitiesTest < Redmine::RoutingTest
+
+  def test_activity
+    should_route 'GET /activity' => 'activities#index'
+    should_route 'GET /activity.atom' => 'activities#index', :format => 'atom'
+  end
+
+  def test_project_activity
+    should_route 'GET /projects/33/activity' => 'activities#index', :id => '33'
+    should_route 'GET /projects/33/activity.atom' => 'activities#index', :id => '33', :format => 'atom'
   end
 end