dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makes relations resource shallow (#7366).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6184 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2011-07-05 16:47:34 +00:00
parent 852cb183b1
commit 42f9dc7d2c
8 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/functional/issue_relations_controller_test.rb
+3 -6
View File
@@ -97,7 +97,7 @@ class IssueRelationsControllerTest < ActionController::TestCase
def test_destroy
assert_difference 'IssueRelation.count', -1 do
@request.session[:user_id] = 3
delete :destroy, :id => '2', :issue_id => '3'
delete :destroy, :id => '2'
end
end
@@ -109,11 +109,8 @@ class IssueRelationsControllerTest < ActionController::TestCase
assert_difference 'IssueRelation.count', -1 do
@request.session[:user_id] = 3
xhr :delete, :destroy, :id => '2', :issue_id => '3'
assert_select_rjs 'relations' do
assert_select 'table', 1
assert_select 'tr', 1 # relation left
end
xhr :delete, :destroy, :id => '2'
assert_select_rjs :remove, 'relation-2'
end
end
end
test/integration/api_test/issue_relations_test.rb
+3 -3
View File
@@ -73,10 +73,10 @@ class ApiTest::IssueRelationsTest < ActionController::IntegrationTest
end
end
context "/issues/:issue_id/relations/:id" do
context "/relations/:id" do
context "GET" do
should "return the relation" do
get '/issues/3/relations/2.xml', {}, :authorization => credentials('jsmith')
get '/relations/2.xml', {}, :authorization => credentials('jsmith')
assert_response :success
assert_equal 'application/xml', @response.content_type
@@ -87,7 +87,7 @@ class ApiTest::IssueRelationsTest < ActionController::IntegrationTest
context "DELETE" do
should "delete the relation" do
assert_difference('IssueRelation.count', -1) do
delete '/issues/3/relations/2.xml', {}, :authorization => credentials('jsmith')
delete '/relations/2.xml', {}, :authorization => credentials('jsmith')
end
assert_response :ok
test/integration/routing_test.rb
+6 -6
View File
@@ -126,13 +126,13 @@ class RoutingTest < ActionController::IntegrationTest
should_route :post, "/issues/1/relations.xml", :controller => 'issue_relations', :action => 'create', :issue_id => '1', :format => 'xml'
should_route :post, "/issues/1/relations.json", :controller => 'issue_relations', :action => 'create', :issue_id => '1', :format => 'json'
should_route :get, "/issues/1/relations/23", :controller => 'issue_relations', :action => 'show', :issue_id => '1', :id => '23'
should_route :get, "/issues/1/relations/23.xml", :controller => 'issue_relations', :action => 'show', :issue_id => '1', :id => '23', :format => 'xml'
should_route :get, "/issues/1/relations/23.json", :controller => 'issue_relations', :action => 'show', :issue_id => '1', :id => '23', :format => 'json'
should_route :get, "/relations/23", :controller => 'issue_relations', :action => 'show', :id => '23'
should_route :get, "/relations/23.xml", :controller => 'issue_relations', :action => 'show', :id => '23', :format => 'xml'
should_route :get, "/relations/23.json", :controller => 'issue_relations', :action => 'show', :id => '23', :format => 'json'
should_route :delete, "/issues/1/relations/23", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23'
should_route :delete, "/issues/1/relations/23.xml", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23', :format => 'xml'
should_route :delete, "/issues/1/relations/23.json", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23', :format => 'json'
should_route :delete, "/relations/23", :controller => 'issue_relations', :action => 'destroy', :id => '23'
should_route :delete, "/relations/23.xml", :controller => 'issue_relations', :action => 'destroy', :id => '23', :format => 'xml'
should_route :delete, "/relations/23.json", :controller => 'issue_relations', :action => 'destroy', :id => '23', :format => 'json'
end
context "issue reports" do