Removes RJS from RepositoriesController.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10048 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 13 insertions, 6 deletions

diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
index 213a1f81a..3304127e1 100644
--- a/test/functional/repositories_controller_test.rb
+++ b/test/functional/repositories_controller_test.rb
@@ -171,20 +171,25 @@ class RepositoriesControllerTest < ActionController::TestCase
   def test_add_related_issue
     @request.session[:user_id] = 2
     assert_difference 'Changeset.find(103).issues.size' do
-      post :add_related_issue, :id => 1, :rev => 4, :issue_id => 2, :format => 'js'
+      xhr :post, :add_related_issue, :id => 1, :rev => 4, :issue_id => 2, :format => 'js'
       assert_response :success
+      assert_template 'add_related_issue'
+      assert_equal 'text/javascript', response.content_type
     end
-    assert_select_rjs :replace_html, 'related-issues'
     assert_equal [2], Changeset.find(103).issue_ids
+    assert_include 'related-issues', response.body
+    assert_include 'Feature request #2', response.body
   end
 
   def test_add_related_issue_with_invalid_issue_id
     @request.session[:user_id] = 2
     assert_no_difference 'Changeset.find(103).issues.size' do
-      post :add_related_issue, :id => 1, :rev => 4, :issue_id => 9999, :format => 'js'
+      xhr :post, :add_related_issue, :id => 1, :rev => 4, :issue_id => 9999, :format => 'js'
       assert_response :success
+      assert_template 'add_related_issue'
+      assert_equal 'text/javascript', response.content_type
     end
-    assert_include 'alert("Issue is invalid")', @response.body
+    assert_include 'alert("Issue is invalid")', response.body
   end
 
   def test_remove_related_issue
@@ -193,11 +198,13 @@ class RepositoriesControllerTest < ActionController::TestCase
 
     @request.session[:user_id] = 2
     assert_difference 'Changeset.find(103).issues.size', -1 do
-      delete :remove_related_issue, :id => 1, :rev => 4, :issue_id => 2, :format => 'js'
+      xhr :delete, :remove_related_issue, :id => 1, :rev => 4, :issue_id => 2, :format => 'js'
       assert_response :success
+      assert_template 'remove_related_issue'
+      assert_equal 'text/javascript', response.content_type
     end
-    assert_select_rjs :remove, 'related-issue-2'
     assert_equal [1], Changeset.find(103).issue_ids
+    assert_include 'related-issue-2', response.body
   end
 
   def test_graph_commits_per_month