diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-14 16:24:07 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-14 16:24:07 +0000 |
| commit | 1b90703157a182d37496ae4c8e3c430681abddc0 (patch) | |
| tree | c70d5f5aa7efa398ca8e8d222cda6c1906e7b386 /test | |
| parent | 41c055363ee4826799b9ffe7d76fd399c89190d3 (diff) | |
| download | redmine-1b90703157a182d37496ae4c8e3c430681abddc0.tar.gz redmine-1b90703157a182d37496ae4c8e3c430681abddc0.zip | |
Refactor: convert FilesController to a restful resource.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4085 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/files_controller_test.rb | 6 | ||||
| -rw-r--r-- | test/integration/routing_test.rb | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/functional/files_controller_test.rb b/test/functional/files_controller_test.rb index 2f6f009e7..6035c4be5 100644 --- a/test/functional/files_controller_test.rb +++ b/test/functional/files_controller_test.rb @@ -12,7 +12,7 @@ class FilesControllerTest < ActionController::TestCase end def test_index - get :index, :id => 1 + get :index, :project_id => 1 assert_response :success assert_template 'index' assert_not_nil assigns(:containers) @@ -33,7 +33,7 @@ class FilesControllerTest < ActionController::TestCase ActionMailer::Base.deliveries.clear assert_difference 'Attachment.count' do - post :create, :id => 1, :version_id => '', + post :create, :project_id => 1, :version_id => '', :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}} assert_response :redirect end @@ -54,7 +54,7 @@ class FilesControllerTest < ActionController::TestCase Setting.notified_events = ['file_added'] assert_difference 'Attachment.count' do - post :create, :id => 1, :version_id => '2', + post :create, :project_id => 1, :version_id => '2', :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}} assert_response :redirect end diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 1867a60b0..38c1b2a0e 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -171,15 +171,15 @@ class RoutingTest < ActionController::IntegrationTest should_route :get, "/projects/1.xml", :controller => 'projects', :action => 'show', :id => '1', :format => 'xml' should_route :get, "/projects/4223/settings", :controller => 'projects', :action => 'settings', :id => '4223' should_route :get, "/projects/4223/settings/members", :controller => 'projects', :action => 'settings', :id => '4223', :tab => 'members' - should_route :get, "/projects/33/files", :controller => 'files', :action => 'index', :id => '33' - should_route :get, "/projects/33/files/new", :controller => 'files', :action => 'new', :id => '33' + should_route :get, "/projects/33/files", :controller => 'files', :action => 'index', :project_id => '33' + should_route :get, "/projects/33/files/new", :controller => 'files', :action => 'new', :project_id => '33' should_route :get, "/projects/33/roadmap", :controller => 'versions', :action => 'index', :project_id => '33' should_route :get, "/projects/33/activity", :controller => 'activities', :action => 'index', :id => '33' should_route :get, "/projects/33/activity.atom", :controller => 'activities', :action => 'index', :id => '33', :format => 'atom' should_route :post, "/projects", :controller => 'projects', :action => 'create' should_route :post, "/projects.xml", :controller => 'projects', :action => 'create', :format => 'xml' - should_route :post, "/projects/33/files/new", :controller => 'files', :action => 'create', :id => '33' + should_route :post, "/projects/33/files", :controller => 'files', :action => 'create', :project_id => '33' should_route :post, "/projects/64/archive", :controller => 'projects', :action => 'archive', :id => '64' should_route :post, "/projects/64/unarchive", :controller => 'projects', :action => 'unarchive', :id => '64' |