jro_apps/redmine Commit - r15282:c364e6ee9b2e

Pass parameters with :params in controller tests....

Jean-Philippe Lang -

r15282:c364e6ee9b2e

parent child

Context file:

r15282:c364e6ee9b2e

Collapse all files

test/functional/users_controller_test.rb +98 -52

                end
                def test_index_with_status_filter
-                 get :index, :status => 3
+                 get :index, :params => {:status => 3}
                  assert_response :success
                  assert_template 'index'
                  assert_not_nil assigns(:users)
                end
                def test_index_with_name_filter
-                 get :index, :name => 'john'
+                 get :index, :params => {:name => 'john'}
                  assert_response :success
                  assert_template 'index'
                  users = assigns(:users)
                end
                def test_index_with_group_filter
-                 get :index, :group_id => '10'
+                 get :index, :params => {:group_id => '10'}
                  assert_response :success
                  assert_template 'index'
                  users = assigns(:users)
                def test_show
                  @request.session[:user_id] = nil
-                 get :show, :id => 2
+                 get :show, :params => {:id => 2}
                  assert_response :success
                  assert_template 'show'
                  assert_not_nil assigns(:user)
                def test_show_should_not_display_hidden_custom_fields
                  @request.session[:user_id] = nil
                  UserCustomField.find_by_name('Phone number').update_attribute :visible, false
-                 get :show, :id => 2
+                 get :show, :params => {:id => 2}
                  assert_response :success
                  assert_template 'show'
                  assert_not_nil assigns(:user)
                  custom_field = CustomField.create!(:name => 'Testing', :field_format => 'text')
                  custom_value = user.custom_values.build(:custom_field => custom_field).save!
-                 get :show, :id => 2
+                 get :show, :params => {:id => 2}
                  assert_response :success
                end
                def test_show_inactive
                  @request.session[:user_id] = nil
-                 get :show, :id => 5
+                 get :show, :params => {:id => 5}
                  assert_response 404
                end
                def test_show_inactive_by_admin
                  @request.session[:user_id] = 1
-                 get :show, :id => 5
+                 get :show, :params => {:id => 5}
                  assert_response 200
                  assert_not_nil assigns(:user)
                end
                  user = User.generate!
                  @request.session[:user_id] = nil
-                 get :show, :id => user.id
+                 get :show, :params => {:id => user.id}
                  assert_response 404
                end
                def test_show_displays_memberships_based_on_project_visibility
                  @request.session[:user_id] = 1
-                 get :show, :id => 2
+                 get :show, :params => {:id => 2}
                  assert_response :success
                  memberships = assigns(:memberships)
                  assert_not_nil memberships
                def test_show_current_should_require_authentication
                  @request.session[:user_id] = nil
-                 get :show, :id => 'current'
+                 get :show, :params => {:id => 'current'}
                  assert_response 302
                end
                def test_show_current
                  @request.session[:user_id] = 2
-                 get :show, :id => 'current'
+                 get :show, :params => {:id => 'current'}
                  assert_response :success
                  assert_template 'show'
                  assert_equal User.find(2), assigns(:user)
                  assert_difference 'User.count' do
                    assert_difference 'ActionMailer::Base.deliveries.size' do
-                     post :create,
+                     post :create, :params => {
                        :user => {
                          :firstname => 'John',
                          :lastname => 'Doe',
                          :mail_notification => 'none'
                        },
                        :send_information => '1'
+                     }
                    end
                  end
                def test_create_with_preferences
                  assert_difference 'User.count' do
-                   post :create,
+                   post :create, :params => {
                      :user => {
                        :firstname => 'John',
                        :lastname => 'Doe',
                        'comments_sorting' => 'desc',
                        'warn_on_leaving_unsaved' => '0'
                      }
+                   }
                  end
                  user = User.order('id DESC').first
                  assert_equal 'jdoe', user.login
                def test_create_with_generate_password_should_email_the_password
                  assert_difference 'User.count' do
-                   post :create, :user => {
+                   post :create, :params => {
+                     :user => {
                      :login => 'randompass',
                      :firstname => 'Random',
                      :lastname => 'Pass',
                      :generate_password => '1',
                      :password => '',
                      :password_confirmation => ''
-                   }, :send_information => 1
+                     },
+                     :send_information => 1
+                   }
                  end
                  user = User.order('id DESC').first
                  assert_equal 'randompass', user.login
                end
                def test_create_and_continue
-                 post :create, :user => {
+                 post :create, :params => {
+                   :user => {
                      :login => 'randompass',
                      :firstname => 'Random',
                      :lastname => 'Pass',
                      :mail => 'randompass@example.net',
                      :generate_password => '1'
-                   }, :continue => '1'
+                   },
+                   :continue => '1'
+                 }
                  assert_redirected_to '/users/new?user%5Bgenerate_password%5D=1'
                end
                def test_create_with_failure
                  assert_no_difference 'User.count' do
-                   post :create, :user => {}
+                   post :create, :params => {:user => {}}
                  end
                  assert_response :success
                  assert_template 'new'
                def test_create_with_failure_sould_preserve_preference
                  assert_no_difference 'User.count' do
-                   post :create,
+                   post :create, :params => {
                      :user => {},
                      :pref => {
                        'no_self_notified' => '1',
                        'comments_sorting' => 'desc',
                        'warn_on_leaving_unsaved' => '0'
                      }
+                   }
                  end
                  assert_response :success
                  assert_template 'new'
                def test_create_admin_should_send_security_notification
                  ActionMailer::Base.deliveries.clear
-                 post :create,
+                 post :create, :params => {
                    :user => {
                      :firstname => 'Edgar',
                      :lastname => 'Schmoe',
                      :mail => 'eschmoe@example.foo',
                      :admin => '1'
                    }
+                 }
                  assert_not_nil (mail = ActionMailer::Base.deliveries.last)
                  assert_mail_body_match '0.0.0.0', mail
                def test_create_non_admin_should_not_send_security_notification
                  ActionMailer::Base.deliveries.clear
-                 post :create,
+                 post :create, :params => {
                    :user => {
                      :firstname => 'Edgar',
                      :lastname => 'Schmoe',
                      :mail => 'eschmoe@example.foo',
                      :admin => '0'
                    }
+                 }
                  assert_nil ActionMailer::Base.deliveries.last
                end
                def test_edit
-                 get :edit, :id => 2
+                 get :edit, :params => {:id => 2}
                  assert_response :success
                  assert_template 'edit'
                  assert_equal User.find(2), assigns(:user)
                def test_edit_registered_user
                  assert User.find(2).register!
-                 get :edit, :id => 2
+                 get :edit, :params => {:id => 2}
                  assert_response :success
                  assert_select 'a', :text => 'Activate'
                end
                def test_update
                  ActionMailer::Base.deliveries.clear
-                 put :update, :id => 2,
+                 put :update, :params => {
+                   :id => 2,
-                     :user => {:firstname => 'Changed', :mail_notification => 'only_assigned'},
-                     :pref => {:hide_mail => '1', :comments_sorting => 'desc'}
+                 }
                  user = User.find(2)
                  assert_equal 'Changed', user.firstname
                  assert_equal 'only_assigned', user.mail_notification
                def test_update_with_failure
                  assert_no_difference 'User.count' do
-                   put :update, :id => 2, :user => {:firstname => ''}
+                   put :update, :params => {
+                     :id => 2,
+                     :user => {:firstname => ''}
+                   }
                  end
                  assert_response :success
                  assert_template 'edit'
                end
                def test_update_with_group_ids_should_assign_groups
-                 put :update, :id => 2, :user => {:group_ids => ['10']}
+                 put :update, :params => {
+                   :id => 2,
+                   :user => {:group_ids => ['10']}
+                 }
                  user = User.find(2)
                  assert_equal [10], user.group_ids
                end
                  ActionMailer::Base.deliveries.clear
                  Setting.bcc_recipients = '1'
-                 put :update, :id => u.id, :user => {:status => User::STATUS_ACTIVE}
+                 put :update, :params => {
+                   :id => u.id,
+                   :user => {:status => User::STATUS_ACTIVE}
+                 }
                  assert u.reload.active?
                  mail = ActionMailer::Base.deliveries.last
                  assert_not_nil mail
                  ActionMailer::Base.deliveries.clear
                  Setting.bcc_recipients = '1'
-                 put :update, :id => 2, :user => {:password => 'newpass123', :password_confirmation => 'newpass123'}, :send_information => '1'
+                 put :update, :params => {
+                   :id => 2,
+                   :user => {:password => 'newpass123', :password_confirmation => 'newpass123'},
+                   :send_information => '1'
+                 }
                  u = User.find(2)
                  assert u.check_password?('newpass123')
                  ActionMailer::Base.deliveries.clear
                  Setting.bcc_recipients = '1'
-                 put :update, :id => 2, :user => {
+                 put :update, :params => {
+                   :id => 2,
+                   :user => {
                    :generate_password => '1',
                    :password => '',
                    :password_confirmation => ''
-                 }, :send_information => '1'
+                   },
+                   :send_information => '1'
+                 }
                  mail = ActionMailer::Base.deliveries.last
                  assert_not_nil mail
                end
                def test_update_without_generate_password_should_not_change_password
-                 put :update, :id => 2, :user => {
+                 put :update, :params => {
+                   :id => 2, :user => {
                    :firstname => 'changed',
                    :generate_password => '0',
                    :password => '',
                    :password_confirmation => ''
-                 }, :send_information => '1'
+                   },
+                   :send_information => '1'
+                 }
                  user = User.find(2)
                  assert_equal 'changed', user.firstname
                  u.auth_source = AuthSource.find(1)
                  u.save!
-                 put :update, :id => u.id, :user => {:auth_source_id => '', :password => 'newpass123', :password_confirmation => 'newpass123'}
+                 put :update, :params => {
+                   :id => u.id,
+                   :user => {:auth_source_id => '', :password => 'newpass123', :password_confirmation => 'newpass123'}
+                 }
                  assert_equal nil, u.reload.auth_source
                  assert u.check_password?('newpass123')
                end
                def test_update_notified_project
-                 get :edit, :id => 2
+                 get :edit, :params => {:id => 2}
                  assert_response :success
                  assert_template 'edit'
                  u = User.find(2)
                  assert_equal [1, 2, 5], u.notified_projects_ids.sort
                  assert_select 'input[name=?][value=?]', 'user[notified_project_ids][]', '1'
                  assert_equal 'all', u.mail_notification
-                 put :update, :id => 2,
+                 put :update, :params => {
+                   :id => 2,
-                     :user => {
-                       :mail_notification => 'selected',
-                       :notified_project_ids => [1, 2]
-                     }
+                 }
                  u = User.find(2)
                  assert_equal 'selected', u.mail_notification
                  assert_equal [1, 2], u.notified_projects_ids.sort
                  user.pref[:no_self_notified] = '1'
                  user.pref.save
-                 put :update, :id => 2, :user => {:status => 3}
+                 put :update, :params => {
+                   :id => 2,
+                   :user => {:status => 3}
+                 }
                  assert_response 302
                  user = User.find(2)
                  assert_equal 3, user.status
                def test_update_assign_admin_should_send_security_notification
                  ActionMailer::Base.deliveries.clear
-                 put :update, :id => 2, :user => {
-                   :admin => 1
+                 put :update, :params => {
+                   :id => 2,
+                   :user => {:admin => 1}
                  }
                  assert_not_nil (mail = ActionMailer::Base.deliveries.last)
                  user.save!
                  ActionMailer::Base.deliveries.clear
-                 put :update, :id => user.id, :user => {
-                   :admin => 0
+                 put :update, :params => {
+                   :id => user.id,
+                   :user => {:admin => 0}
                  }
                  assert_not_nil (mail = ActionMailer::Base.deliveries.last)
                  user.save!
                  ActionMailer::Base.deliveries.clear
-                 put :update, :id => 2, :user => {
-                   :status => Principal::STATUS_LOCKED
+                 put :update, :params => {
+                   :id => 2,
+                   :user => {:status => Principal::STATUS_LOCKED}
                  }
                  assert_not_nil (mail = ActionMailer::Base.deliveries.last)
                  # if user is already locked, destroying should not send a second mail
                  # (for active admins see furtherbelow)
                  ActionMailer::Base.deliveries.clear
-                 delete :destroy, :id => 1
+                 delete :destroy, :params => {:id => 1}
                  assert_nil ActionMailer::Base.deliveries.last
                end
                  user.admin = true
                  user.save!
                  ActionMailer::Base.deliveries.clear
-                 put :update, :id => user.id, :user => {
-                   :status => Principal::STATUS_ACTIVE
+                 put :update, :params => {
+                   :id => user.id,
+                   :user => {:status => Principal::STATUS_ACTIVE}
                  }
                  assert_not_nil (mail = ActionMailer::Base.deliveries.last)
                def test_update_admin_unrelated_property_should_not_send_security_notification
                  ActionMailer::Base.deliveries.clear
-                 put :update, :id => 1, :user => {
-                   :firstname => 'Jimmy'
+                 put :update, :params => {
+                   :id => 1,
+                   :user => {:firstname => 'Jimmy'}
                  }
                  assert_nil ActionMailer::Base.deliveries.last
                end
                def test_destroy
                  assert_difference 'User.count', -1 do
-                   delete :destroy, :id => 2
+                   delete :destroy, :params => {:id => 2}
                  end
                  assert_redirected_to '/users'
                  assert_nil User.find_by_id(2)
                  @request.session[:user_id] = 3
                  assert_no_difference 'User.count' do
-                   get :destroy, :id => 2
+                   get :destroy, :params => {:id => 2}
                  end
                  assert_response 403
                end
                def test_destroy_should_redirect_to_back_url_param
                  assert_difference 'User.count', -1 do
-                   delete :destroy, :id => 2, :back_url => '/users?name=foo'
+                   delete :destroy, :params => {:id => 2, :back_url => '/users?name=foo'}
                  end
                  assert_redirected_to '/users?name=foo'
                end
                  user.admin = true
                  user.save!
                  ActionMailer::Base.deliveries.clear
-                 delete :destroy, :id => user.id
+                 delete :destroy, :params => {:id => user.id}
                  assert_not_nil (mail = ActionMailer::Base.deliveries.last)
                  assert_mail_body_match I18n.t(:mail_body_security_notification_remove, field: I18n.t(:field_admin), value: user.login), mail

test/test_helper.rb +8 0

                end
                class ControllerTest < ActionController::TestCase
+                 def process(method, path, parameters={}, options={})
+                   if parameters.key?(:params)
+                     raise ArgumentError if options.present?
+                     super method, path, parameters[:params], parameters.except(:params)
+                   else
+                     super
+                   end
+                 end
                end
                class IntegrationTest < ActionDispatch::IntegrationTest

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