Refactor: Move the rest of the routing tests to RoutingTest.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3687 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -31,13 +31,6 @@ class MessagesControllerTest < ActionController::TestCase
|
||||
User.current = nil
|
||||
end
|
||||
|
||||
def test_show_routing
|
||||
assert_routing(
|
||||
{:method => :get, :path => '/boards/22/topics/2'},
|
||||
:controller => 'messages', :action => 'show', :id => '2', :board_id => '22'
|
||||
)
|
||||
end
|
||||
|
||||
def test_show
|
||||
get :show, :board_id => 1, :id => 1
|
||||
assert_response :success
|
||||
@@ -77,17 +70,6 @@ class MessagesControllerTest < ActionController::TestCase
|
||||
assert_response 404
|
||||
end
|
||||
|
||||
def test_new_routing
|
||||
assert_routing(
|
||||
{:method => :get, :path => '/boards/lala/topics/new'},
|
||||
:controller => 'messages', :action => 'new', :board_id => 'lala'
|
||||
)
|
||||
assert_recognizes(#TODO: POST to collection, need to adjust form accordingly
|
||||
{:controller => 'messages', :action => 'new', :board_id => 'lala'},
|
||||
{:method => :post, :path => '/boards/lala/topics/new'}
|
||||
)
|
||||
end
|
||||
|
||||
def test_get_new
|
||||
@request.session[:user_id] = 2
|
||||
get :new, :board_id => 1
|
||||
@@ -120,17 +102,6 @@ class MessagesControllerTest < ActionController::TestCase
|
||||
assert mail.bcc.include?('dlopper@somenet.foo')
|
||||
end
|
||||
|
||||
def test_edit_routing
|
||||
assert_routing(
|
||||
{:method => :get, :path => '/boards/lala/topics/22/edit'},
|
||||
:controller => 'messages', :action => 'edit', :board_id => 'lala', :id => '22'
|
||||
)
|
||||
assert_recognizes( #TODO: use PUT to topic_path, modify form accordingly
|
||||
{:controller => 'messages', :action => 'edit', :board_id => 'lala', :id => '22'},
|
||||
{:method => :post, :path => '/boards/lala/topics/22/edit'}
|
||||
)
|
||||
end
|
||||
|
||||
def test_get_edit
|
||||
@request.session[:user_id] = 2
|
||||
get :edit, :board_id => 1, :id => 1
|
||||
@@ -149,13 +120,6 @@ class MessagesControllerTest < ActionController::TestCase
|
||||
assert_equal 'New body', message.content
|
||||
end
|
||||
|
||||
def test_reply_routing
|
||||
assert_recognizes(
|
||||
{:controller => 'messages', :action => 'reply', :board_id => '22', :id => '555'},
|
||||
{:method => :post, :path => '/boards/22/topics/555/replies'}
|
||||
)
|
||||
end
|
||||
|
||||
def test_reply
|
||||
@request.session[:user_id] = 2
|
||||
post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' }
|
||||
@@ -164,13 +128,6 @@ class MessagesControllerTest < ActionController::TestCase
|
||||
assert Message.find_by_subject('Test reply')
|
||||
end
|
||||
|
||||
def test_destroy_routing
|
||||
assert_recognizes(#TODO: use DELETE to topic_path, adjust form accordingly
|
||||
{:controller => 'messages', :action => 'destroy', :board_id => '22', :id => '555'},
|
||||
{:method => :post, :path => '/boards/22/topics/555/destroy'}
|
||||
)
|
||||
end
|
||||
|
||||
def test_destroy_topic
|
||||
@request.session[:user_id] = 2
|
||||
post :destroy, :board_id => 1, :id => 1
|
||||
|
||||
Reference in New Issue
Block a user