jro_apps/redmine Commit - r9876:47e496f049d7

Removes RJS from UsersController....

Jean-Philippe Lang -

r9876:47e496f049d7

parent child

Context file:

r9876:47e496f049d7

Collapse all files

app/views/users/destroy_membership.js.erb created 644 +1 0

			@@ -0,0 +1,1
		1	Element.update('tab-content-memberships', '<%= escape_javascript(render :partial => 'users/memberships') %>');

app/views/users/edit_membership.js.erb created 644 +6 0

			@@ -0,0 +1,6
		1	<% if @membership.valid? %>
		2	Element.update("tab-content-memberships", '<%= escape_javascript(render :partial => 'users/memberships') %>');
		3	new Effect.Highlight("member-<%= @membership.id %>")
		4	<% else %>
		5	alert('<%= escape_javascript l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')) %>');
		6	<% end %>

app/controllers/users_controller.rb +3 -16

                  @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
                  @membership.save
                  respond_to do |format|
-                   if @membership.valid?
-                     format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
-                     format.js {
-                       render(:update) {|page|
-                         page.replace_html "tab-content-memberships", :partial => 'users/memberships'
-                         page.visual_effect(:highlight, "member-#{@membership.id}")
+                       }
+                     }
-                   else
-                     format.js {
-                       render(:update) {|page|
-                         page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
+                       }
+                     }
-                   end
+                   format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
+                   format.js
                  end
                end
                  end
                  respond_to do |format|
                    format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
-                   format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'users/memberships'} }
+                   format.js
                  end
                end

test/functional/users_controller_test.rb +20 -10

                def test_create_membership_js_format
                  assert_difference 'Member.count' do
                    post :edit_membership, :id => 7, :membership => {:project_id => 3, :role_ids => [2]}, :format => 'js'
+                   assert_response :success
+                   assert_template 'edit_membership'
+                   assert_equal 'text/javascript', response.content_type
                  end
-                 assert_response :success
-                 assert_select_rjs :replace_html, 'tab-content-memberships'
                  member = Member.first(:order => 'id DESC')
                  assert_equal User.find(7), member.principal
                  assert_equal [2], member.role_ids
                  assert_equal 3, member.project_id
+                 assert_include 'tab-content-memberships', response.body
                end
                def test_create_membership_js_format_with_failure
                  assert_no_difference 'Member.count' do
                    post :edit_membership, :id => 7, :membership => {:project_id => 3}, :format => 'js'
+                   assert_response :success
+                   assert_template 'edit_membership'
+                   assert_equal 'text/javascript', response.content_type
                  end
-                 assert_response :success
-                 assert @response.body.match(/alert/i), "Alert message not sent"
-                 assert @response.body.match(/role can't be empty/i), "Error message not sent"
+                 assert_include 'alert', response.body, "Alert message not sent"
+                 assert_include 'Role can\\\'t be empty', response.body, "Error message not sent"
                end
                def test_update_membership
                  assert_no_difference 'Member.count' do
                    put :edit_membership, :id => 2, :membership_id => 1, :membership => { :role_ids => [2]}
+                   assert_redirected_to :action => 'edit', :id => '2', :tab => 'memberships'
                  end
-                 assert_redirected_to :action => 'edit', :id => '2', :tab => 'memberships'
                  assert_equal [2], Member.find(1).role_ids
                end
                def test_update_membership_js_format
                  assert_no_difference 'Member.count' do
                    put :edit_membership, :id => 2, :membership_id => 1, :membership => {:role_ids => [2]}, :format => 'js'
+                   assert_response :success
+                   assert_template 'edit_membership'
+                   assert_equal 'text/javascript', response.content_type
                  end
-                 assert_response :success
-                 assert_select_rjs :replace_html, 'tab-content-memberships'
+                 assert_equal [2], Member.find(1).role_ids
+                 assert_include 'tab-content-memberships', response.body
                end
                def test_destroy_membership
                def test_destroy_membership_js_format
                  assert_difference 'Member.count', -1 do
                    delete :destroy_membership, :id => 2, :membership_id => 1, :format => 'js'
+                   assert_response :success
+                   assert_template 'destroy_membership'
+                   assert_equal 'text/javascript', response.content_type
                  end
-                 assert_response :success
-                 assert_select_rjs :replace_html, 'tab-content-memberships'
+                 assert_nil Member.find_by_id(1)
+                 assert_include 'tab-content-memberships', response.body
                end
              end

test/test_helper.rb +2 -2

                  assert_tag({:attributes => { :id => 'errorExplanation' }}.merge(options))
                end
-               def assert_include(expected, s)
-                 assert s.include?(expected), "\"#{expected}\" not found in \"#{s}\""
+               def assert_include(expected, s, message=nil)
+                 assert s.include?(expected), (message || "\"#{expected}\" not found in \"#{s}\"")
                end
                def assert_not_include(expected, s)

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