jro_apps/redmine Commit - r9551:cfaa0fc23e00

fix project list is not shown on Email notifications (#11032)...

Toshi MARUYAMA -

r9551:cfaa0fc23e00

parent child

Context file:

r9551:cfaa0fc23e00

Collapse all files

app/views/users/_mail_notifications.html.erb +1 -1

              <p>
              <%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted" %>
              <%= select_tag 'user[mail_notification]', options_for_select(user_mail_notification_options(@user), @user.mail_notification),
                                                    :onchange => 'if (this.value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}' %>
              </p>
-             <% content_tag 'div', :id => 'notified-projects', :style => (@user.mail_notification == 'selected' ? '' : 'display:none;') do %>
+             <%= content_tag 'div', :id => 'notified-projects', :style => (@user.mail_notification == 'selected' ? '' : 'display:none;') do %>
              <p><% @user.projects.each do |project| %>
                  <label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%=h project.name %></label><br />
              <% end %></p>
              <p><em class="info"><%= l(:text_user_mail_option) %></em></p>
              <% end %>
              <p><label><%= l(:label_user_mail_no_self_notified) %><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified] %></label></p>

test/functional/users_controller_test.rb +23 0

              # Redmine - project management software
              # Copyright (C) 2006-2012  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require File.expand_path('../../test_helper', __FILE__)
              require 'users_controller'
              # Re-raise errors caught by the controller.
              class UsersController; def rescue_action(e) raise e end; end
              class UsersControllerTest < ActionController::TestCase
                include Redmine::I18n
                fixtures :users, :projects, :members, :member_roles, :roles,
                         :custom_fields, :custom_values, :groups_users,
                         :auth_sources
                def setup
                  @controller = UsersController.new
                  @request    = ActionController::TestRequest.new
                  @response   = ActionController::TestResponse.new
                  User.current = nil
                  @request.session[:user_id] = 1 # admin
                end
                def test_index
                  get :index
                  assert_response :success
                  assert_template 'index'
                end
                def test_index
                  get :index
                  assert_response :success
                  assert_template 'index'
                  assert_not_nil assigns(:users)
                  # active users only
                  assert_nil assigns(:users).detect {|u| !u.active?}
                end
                def test_index_with_status_filter
                  get :index, :status => 3
                  assert_response :success
                  assert_template 'index'
                  assert_not_nil assigns(:users)
                  assert_equal [3], assigns(:users).map(&:status).uniq
                end
                def test_index_with_name_filter
                  get :index, :name => 'john'
                  assert_response :success
                  assert_template 'index'
                  users = assigns(:users)
                  assert_not_nil users
                  assert_equal 1, users.size
                  assert_equal 'John', users.first.firstname
                end
                def test_index_with_group_filter
                  get :index, :group_id => '10'
                  assert_response :success
                  assert_template 'index'
                  users = assigns(:users)
                  assert users.any?
                  assert_equal([], (users - Group.find(10).users))
                  assert_select 'select[name=group_id]' do
                    assert_select 'option[value=10][selected=selected]'
                  end
                end
                def test_show
                  @request.session[:user_id] = nil
                  get :show, :id => 2
                  assert_response :success
                  assert_template 'show'
                  assert_not_nil assigns(:user)
                  assert_tag 'li', :content => /Phone number/
                end
                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
                  assert_response :success
                  assert_template 'show'
                  assert_not_nil assigns(:user)
                  assert_no_tag 'li', :content => /Phone number/
                end
                def test_show_should_not_fail_when_custom_values_are_nil
                  user = User.find(2)
                  # Create a custom field to illustrate the issue
                  custom_field = CustomField.create!(:name => 'Testing', :field_format => 'text')
                  custom_value = user.custom_values.build(:custom_field => custom_field).save!
                  get :show, :id => 2
                  assert_response :success
                end
                def test_show_inactive
                  @request.session[:user_id] = nil
                  get :show, :id => 5
                  assert_response 404
                end
                def test_show_should_not_reveal_users_with_no_visible_activity_or_project
                  @request.session[:user_id] = nil
                  get :show, :id => 9
                  assert_response 404
                end
                def test_show_inactive_by_admin
                  @request.session[:user_id] = 1
                  get :show, :id => 5
                  assert_response 200
                  assert_not_nil assigns(:user)
                end
                def test_show_displays_memberships_based_on_project_visibility
                  @request.session[:user_id] = 1
                  get :show, :id => 2
                  assert_response :success
                  memberships = assigns(:memberships)
                  assert_not_nil memberships
                  project_ids = memberships.map(&:project_id)
                  assert project_ids.include?(2) #private project admin can see
                end
                def test_show_current_should_require_authentication
                  @request.session[:user_id] = nil
                  get :show, :id => 'current'
                  assert_response 302
                end
                def test_show_current
                  @request.session[:user_id] = 2
                  get :show, :id => 'current'
                  assert_response :success
                  assert_template 'show'
                  assert_equal User.find(2), assigns(:user)
                end
                def test_new
                  get :new
                  assert_response :success
                  assert_template :new
                  assert assigns(:user)
                end
                def test_create
                  Setting.bcc_recipients = '1'
                  assert_difference 'User.count' do
                    assert_difference 'ActionMailer::Base.deliveries.size' do
                      post :create,
                        :user => {
                          :firstname => 'John',
                          :lastname => 'Doe',
                          :login => 'jdoe',
                          :password => 'secret',
                          :password_confirmation => 'secret',
                          :mail => 'jdoe@gmail.com',
                          :mail_notification => 'none'
                        },
                        :send_information => '1'
                    end
                  end
                  user = User.first(:order => 'id DESC')
                  assert_redirected_to :controller => 'users', :action => 'edit', :id => user.id
                  assert_equal 'John', user.firstname
                  assert_equal 'Doe', user.lastname
                  assert_equal 'jdoe', user.login
                  assert_equal 'jdoe@gmail.com', user.mail
                  assert_equal 'none', user.mail_notification
                  assert user.check_password?('secret')
                  mail = ActionMailer::Base.deliveries.last
                  assert_not_nil mail
                  assert_equal [user.mail], mail.bcc
                  assert_mail_body_match 'secret', mail
                end
                def test_create_with_preferences
                  assert_difference 'User.count' do
                    post :create,
                      :user => {
                        :firstname => 'John',
                        :lastname => 'Doe',
                        :login => 'jdoe',
                        :password => 'secret',
                        :password_confirmation => 'secret',
                        :mail => 'jdoe@gmail.com',
                        :mail_notification => 'none'
                      },
                      :pref => {
                        'hide_mail' => '1',
                        'time_zone' => 'Paris',
                        'comments_sorting' => 'desc',
                        'warn_on_leaving_unsaved' => '0'
                      }
                  end
                  user = User.first(:order => 'id DESC')
                  assert_equal 'jdoe', user.login
                  assert_equal true, user.pref.hide_mail
                  assert_equal 'Paris', user.pref.time_zone
                  assert_equal 'desc', user.pref[:comments_sorting]
                  assert_equal '0', user.pref[:warn_on_leaving_unsaved]
                end
                def test_create_with_failure
                  assert_no_difference 'User.count' do
                    post :create, :user => {}
                  end
                  assert_response :success
                  assert_template 'new'
                end
                def test_edit
                  get :edit, :id => 2
                  assert_response :success
                  assert_template 'edit'
                  assert_equal User.find(2), assigns(:user)
                end
                def test_update
                  ActionMailer::Base.deliveries.clear
                  put :update, :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
                  assert_equal true, user.pref[:hide_mail]
                  assert_equal 'desc', user.pref[:comments_sorting]
                  assert ActionMailer::Base.deliveries.empty?
                end
                def test_update_with_failure
                  assert_no_difference 'User.count' do
                    put :update, :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']}
                  user = User.find(2)
                  assert_equal [10], user.group_ids
                end
                def test_update_with_activation_should_send_a_notification
                  u = User.new(:firstname => 'Foo', :lastname => 'Bar', :mail => 'foo.bar@somenet.foo', :language => 'fr')
                  u.login = 'foo'
                  u.status = User::STATUS_REGISTERED
                  u.save!
                  ActionMailer::Base.deliveries.clear
                  Setting.bcc_recipients = '1'
                  put :update, :id => u.id, :user => {:status => User::STATUS_ACTIVE}
                  assert u.reload.active?
                  mail = ActionMailer::Base.deliveries.last
                  assert_not_nil mail
                  assert_equal ['foo.bar@somenet.foo'], mail.bcc
                  assert_mail_body_match ll('fr', :notice_account_activated), mail
                end
                def test_update_with_password_change_should_send_a_notification
                  ActionMailer::Base.deliveries.clear
                  Setting.bcc_recipients = '1'
                  put :update, :id => 2, :user => {:password => 'newpass', :password_confirmation => 'newpass'}, :send_information => '1'
                  u = User.find(2)
                  assert u.check_password?('newpass')
                  mail = ActionMailer::Base.deliveries.last
                  assert_not_nil mail
                  assert_equal [u.mail], mail.bcc
                  assert_mail_body_match 'newpass', mail
                end
                def test_update_user_switchin_from_auth_source_to_password_authentication
                  # Configure as auth source
                  u = User.find(2)
                  u.auth_source = AuthSource.find(1)
                  u.save!
                  put :update, :id => u.id, :user => {:auth_source_id => '', :password => 'newpass', :password_confirmation => 'newpass'}
                  assert_equal nil, u.reload.auth_source
                  assert u.check_password?('newpass')
                end
+               def test_update_notified_project
+                 get :edit, :id => 2
+                 assert_response :success
+                 assert_template 'edit'
+                 u = User.find(2)
+                 assert_equal [1, 2, 5], u.projects.collect{|p| p.id}.sort
+                 assert_equal [1, 2, 5], u.notified_projects_ids.sort
+                 assert_tag :tag => 'input',
+                            :attributes => {
+                               :id    => 'notified_project_ids_',
+                               :value => 1,
+                             }
+                 assert_equal 'all', u.mail_notification
+                 put :update, :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
+               end
                def test_destroy
                  assert_difference 'User.count', -1 do
                    delete :destroy, :id => 2
                  end
                  assert_redirected_to '/users'
                  assert_nil User.find_by_id(2)
                end
                def test_destroy_should_be_denied_for_non_admin_users
                  @request.session[:user_id] = 3
                  assert_no_difference 'User.count' do
                    get :destroy, :id => 2
                  end
                  assert_response 403
                end
                def test_create_membership
                  assert_difference 'Member.count' do
                    post :edit_membership, :id => 7, :membership => { :project_id => 3, :role_ids => [2]}
                  end
                  assert_redirected_to :action => 'edit', :id => '7', :tab => '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
                end
                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'
                  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
                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'
                  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"
                end
                def test_update_membership
                  assert_no_difference 'Member.count' do
                    put :edit_membership, :id => 2, :membership_id => 1, :membership => { :role_ids => [2]}
                  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'
                  end
                  assert_response :success
                  assert_select_rjs :replace_html, 'tab-content-memberships'
                end
                def test_destroy_membership
                  assert_difference 'Member.count', -1 do
                    delete :destroy_membership, :id => 2, :membership_id => 1
                  end
                  assert_redirected_to :action => 'edit', :id => '2', :tab => 'memberships'
                  assert_nil Member.find_by_id(1)
                end
                def test_destroy_membership_js_format
                  assert_difference 'Member.count', -1 do
                    delete :destroy_membership, :id => 2, :membership_id => 1, :format => 'js'
                  end
                  assert_response :success
                  assert_select_rjs :replace_html, 'tab-content-memberships'
                end
              end

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