From ecda1c7a4f30354db74e73eade71550074f67356 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 16 Nov 2014 14:23:32 +0000 Subject: Use should_route in routing tests. git-svn-id: http://svn.redmine.org/redmine/trunk@13608 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/integration/routing/custom_fields_test.rb | 33 +++++++------------------- 1 file changed, 8 insertions(+), 25 deletions(-) (limited to 'test/integration/routing/custom_fields_test.rb') diff --git a/test/integration/routing/custom_fields_test.rb b/test/integration/routing/custom_fields_test.rb index 075e28d64..ef9f078f7 100644 --- a/test/integration/routing/custom_fields_test.rb +++ b/test/integration/routing/custom_fields_test.rb @@ -17,31 +17,14 @@ require File.expand_path('../../../test_helper', __FILE__) -class RoutingCustomFieldsTest < ActionDispatch::IntegrationTest +class RoutingCustomFieldsTest < Redmine::RoutingTest def test_custom_fields - assert_routing( - { :method => 'get', :path => "/custom_fields" }, - { :controller => 'custom_fields', :action => 'index' } - ) - assert_routing( - { :method => 'get', :path => "/custom_fields/new" }, - { :controller => 'custom_fields', :action => 'new' } - ) - assert_routing( - { :method => 'post', :path => "/custom_fields" }, - { :controller => 'custom_fields', :action => 'create' } - ) - assert_routing( - { :method => 'get', :path => "/custom_fields/2/edit" }, - { :controller => 'custom_fields', :action => 'edit', :id => '2' } - ) - assert_routing( - { :method => 'put', :path => "/custom_fields/2" }, - { :controller => 'custom_fields', :action => 'update', :id => '2' } - ) - assert_routing( - { :method => 'delete', :path => "/custom_fields/2" }, - { :controller => 'custom_fields', :action => 'destroy', :id => '2' } - ) + should_route 'GET /custom_fields' => 'custom_fields#index' + should_route 'GET /custom_fields/new' => 'custom_fields#new' + should_route 'POST /custom_fields' => 'custom_fields#create' + + should_route 'GET /custom_fields/2/edit' => 'custom_fields#edit', :id => '2' + should_route 'PUT /custom_fields/2' => 'custom_fields#update', :id => '2' + should_route 'DELETE /custom_fields/2' => 'custom_fields#destroy', :id => '2' end end -- cgit v1.2.3