jro_apps/redmine Commit - r9865:87da04c808e2

Removes RJS from RepositoriesController....

Jean-Philippe Lang -

r9865:87da04c808e2

parent child

Context file:

r9865:87da04c808e2

Collapse all files

app/views/repositories/add_related_issue.js.erb created 644 +6 0

			@@ -0,0 +1,6
		1	<% if @issue %>
		2	Element.update('related-issues', '<%= escape_javascript(render :partial => "related_issues") %>');
		3	Effect.highlight('related-issue-<%= @issue.id %>');
		4	<% else %>
		5	alert("<%= escape_javascript(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid')) %>");
		6	<% end %>

app/views/repositories/remove_related_issue.js.erb created 644 +1 0

			@@ -0,0 +1,1
		1	Element.remove('related-issue-<%= @issue.id %>');

app/controllers/repositories_controller.rb 0 -25

                  if @issue
                    @changeset.issues << @issue
-                   respond_to do |format|
-                     format.js {
-                       render :update do |page|
-                         page.replace_html "related-issues", :partial => "related_issues"
-                         page.visual_effect :highlight, "related-issue-#{@issue.id}"
-                       end
+                     }
-                   end
-                 else
-                   respond_to do |format|
-                     format.js {
-                       render :update do |page|
-                         page.alert(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid'))
-                       end
+                     }
-                   end
                  end
                end
                  if @issue
                    @changeset.issues.delete(@issue)
                  end
-                 respond_to do |format|
-                   format.js {
-                     render :update do |page|
-                       page.remove "related-issue-#{@issue.id}"
-                     end if @issue
+                   }
-                 end
                end
                def diff
                  graph.burn
                end
              end

test/functional/repositories_controller_test.rb +13 -6

                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
                  @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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages