From 852cb183b184f65e352f2619250782f6de7dbfd9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 5 Jul 2011 16:29:06 +0000 Subject: Makes versions resource shallow (#7403). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6183 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/integration/api_test/versions_test.rb | 8 ++++---- test/integration/routing_test.rb | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'test') diff --git a/test/integration/api_test/versions_test.rb b/test/integration/api_test/versions_test.rb index 3872676ae..2ffb74b58 100644 --- a/test/integration/api_test/versions_test.rb +++ b/test/integration/api_test/versions_test.rb @@ -74,10 +74,10 @@ class ApiTest::VersionsTest < ActionController::IntegrationTest end end - context "/projects/:project_id/versions/:id" do + context "/versions/:id" do context "GET" do should "return the version" do - get '/projects/1/versions/2.xml' + get '/versions/2.xml' assert_response :success assert_equal 'application/xml', @response.content_type @@ -95,7 +95,7 @@ class ApiTest::VersionsTest < ActionController::IntegrationTest context "PUT" do should "update the version" do - put '/projects/1/versions/2.xml', {:version => {:name => 'API update'}}, :authorization => credentials('jsmith') + put '/versions/2.xml', {:version => {:name => 'API update'}}, :authorization => credentials('jsmith') assert_response :ok assert_equal 'API update', Version.find(2).name @@ -105,7 +105,7 @@ class ApiTest::VersionsTest < ActionController::IntegrationTest context "DELETE" do should "destroy the version" do assert_difference 'Version.count', -1 do - delete '/projects/1/versions/3.xml', {}, :authorization => credentials('jsmith') + delete '/versions/3.xml', {}, :authorization => credentials('jsmith') end assert_response :ok diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index a53c46567..199dc1b27 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -337,22 +337,22 @@ class RoutingTest < ActionController::IntegrationTest should_route :post, "/projects/foo/versions.xml", :controller => 'versions', :action => 'create', :project_id => 'foo', :format => 'xml' should_route :post, "/projects/foo/versions.json", :controller => 'versions', :action => 'create', :project_id => 'foo', :format => 'json' - should_route :get, "/projects/foo/versions/1", :controller => 'versions', :action => 'show', :project_id => 'foo', :id => '1' - should_route :get, "/projects/foo/versions/1.xml", :controller => 'versions', :action => 'show', :project_id => 'foo', :id => '1', :format => 'xml' - should_route :get, "/projects/foo/versions/1.json", :controller => 'versions', :action => 'show', :project_id => 'foo', :id => '1', :format => 'json' + should_route :get, "/versions/1", :controller => 'versions', :action => 'show', :id => '1' + should_route :get, "/versions/1.xml", :controller => 'versions', :action => 'show', :id => '1', :format => 'xml' + should_route :get, "/versions/1.json", :controller => 'versions', :action => 'show', :id => '1', :format => 'json' - should_route :get, "/projects/foo/versions/1/edit", :controller => 'versions', :action => 'edit', :project_id => 'foo', :id => '1' + should_route :get, "/versions/1/edit", :controller => 'versions', :action => 'edit', :id => '1' - should_route :put, "/projects/foo/versions/1", :controller => 'versions', :action => 'update', :project_id => 'foo', :id => '1' - should_route :put, "/projects/foo/versions/1.xml", :controller => 'versions', :action => 'update', :project_id => 'foo', :id => '1', :format => 'xml' - should_route :put, "/projects/foo/versions/1.json", :controller => 'versions', :action => 'update', :project_id => 'foo', :id => '1', :format => 'json' + should_route :put, "/versions/1", :controller => 'versions', :action => 'update', :id => '1' + should_route :put, "/versions/1.xml", :controller => 'versions', :action => 'update', :id => '1', :format => 'xml' + should_route :put, "/versions/1.json", :controller => 'versions', :action => 'update', :id => '1', :format => 'json' - should_route :delete, "/projects/foo/versions/1", :controller => 'versions', :action => 'destroy', :project_id => 'foo', :id => '1' - should_route :delete, "/projects/foo/versions/1.xml", :controller => 'versions', :action => 'destroy', :project_id => 'foo', :id => '1', :format => 'xml' - should_route :delete, "/projects/foo/versions/1.json", :controller => 'versions', :action => 'destroy', :project_id => 'foo', :id => '1', :format => 'json' + should_route :delete, "/versions/1", :controller => 'versions', :action => 'destroy', :id => '1' + should_route :delete, "/versions/1.xml", :controller => 'versions', :action => 'destroy', :id => '1', :format => 'xml' + should_route :delete, "/versions/1.json", :controller => 'versions', :action => 'destroy', :id => '1', :format => 'json' should_route :put, "/projects/foo/versions/close_completed", :controller => 'versions', :action => 'close_completed', :project_id => 'foo' - should_route :post, "/projects/foo/versions/1/status_by", :controller => 'versions', :action => 'status_by', :project_id => 'foo', :id => '1' + should_route :post, "/versions/1/status_by", :controller => 'versions', :action => 'status_by', :id => '1' end context "wiki (singular, project's pages)" do -- cgit v1.2.3