jro_apps/redmine Commit - r15548:8b86d5158e50

Moves blocks definition to Redmine::MyPage....

Jean-Philippe Lang -

r15548:8b86d5158e50

parent child

Context file:

r15548:8b86d5158e50

Collapse all files

app/controllers/my_controller.rb +9 -28

             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             class MyController < ApplicationController
               before_action :require_login
               # let user change user's password when user has to
               skip_before_action :check_password_change, :only => :password
               require_sudo_mode :account, only: :post
               require_sudo_mode :reset_rss_key, :reset_api_key, :show_api_key, :destroy
               helper :issues
               helper :users
               helper :custom_fields
-              BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
-                         'issuesreportedbyme' => :label_reported_issues,
-                         'issueswatched' => :label_watched_issues,
-                         'news' => :label_news_latest,
-                         'calendar' => :label_calendar,
-                         'documents' => :label_document_plural,
-                         'timelog' => :label_spent_time
-                       }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze
-              DEFAULT_LAYOUT = {  'left' => ['issuesassignedtome'],
-                                  'right' => ['issuesreportedbyme']
-                               }.freeze
               def index
                 page
                 render :action => 'page'
               end
               # Show user's page
               def page
                 @user = User.current
-                @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
+                @blocks = @user.pref.my_page_layout
               end
               # Edit user's account
               def account
                 @user = User.current
                 @pref = @user.pref
                 if request.post?
                   @user.safe_attributes = params[:user]
                   @user.pref.safe_attributes = params[:pref]
                   if @user.save
                     @user.pref.save
                     set_language_if_valid @user.language
                     flash[:notice] = l(:notice_account_updated)
                     redirect_to my_account_path
                     return
                   end
                 end
               end
               # Destroys user's account
               def destroy
                 @user = User.current
                 unless @user.own_account_deletable?
                   redirect_to my_account_path
                   return
                 end
                 if request.post? && params[:confirm]
                   @user.destroy
                   if @user.destroyed?
                     logout_user
                     flash[:notice] = l(:notice_account_deleted)
                   end
                   redirect_to home_path
                 end
               end
               # Manage user's password
               def password
                 @user = User.current
                 unless @user.change_password_allowed?
                   flash[:error] = l(:notice_can_t_change_password)
                   redirect_to my_account_path
                   return
                 end
                 if request.post?
                   if !@user.check_password?(params[:password])
                     flash.now[:error] = l(:notice_account_wrong_password)
                   elsif params[:password] == params[:new_password]
                     flash.now[:error] = l(:notice_new_password_must_be_different)
                   else
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                     @user.must_change_passwd = false
                     if @user.save
                       # The session token was destroyed by the password change, generate a new one
                       session[:tk] = @user.generate_session_token
                       Mailer.password_updated(@user)
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to my_account_path
                     end
                   end
                 end
               end
               # Create a new feeds key
               def reset_rss_key
                 if request.post?
                   if User.current.rss_token
                     User.current.rss_token.destroy
                     User.current.reload
                   end
                   User.current.rss_key
                   flash[:notice] = l(:notice_feeds_access_key_reseted)
                 end
                 redirect_to my_account_path
               end
               def show_api_key
                 @user = User.current
               end
               # Create a new API key
               def reset_api_key
                 if request.post?
                   if User.current.api_token
                     User.current.api_token.destroy
                     User.current.reload
                   end
                   User.current.api_key
                   flash[:notice] = l(:notice_api_access_key_reseted)
                 end
                 redirect_to my_account_path
               end
               # User's page layout configuration
               def page_layout
                 @user = User.current
-                @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT.dup
+                @blocks = @user.pref.my_page_layout
-                @block_options = []
-                BLOCKS.each do |k, v|
-                  unless @blocks.values.flatten.include?(k)
-                    @block_options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize]
-                  end
-                end
               end
               # Add a block to user's page
               # The block is added on top of the page
               # params[:block] : id of the block to add
               def add_block
                 block = params[:block].to_s.underscore
-                if block.present? && BLOCKS.key?(block)
+                if block.present? && Redmine::MyPage.blocks.key?(block)
                   @user = User.current
-                  layout = @user.pref[:my_page_layout] || {}
+                  layout = @user.pref.my_page_layout
                   # remove if already present in a group
                   %w(top left right).each {|f| (layout[f] ||= []).delete block }
                   # add it on top
                   layout['top'].unshift block
-                  @user.pref[:my_page_layout] = layout
+                  @user.pref.my_page_layout = layout
                   @user.pref.save
                 end
                 redirect_to my_page_layout_path
               end
               # Remove a block to user's page
               # params[:block] : id of the block to remove
               def remove_block
                 block = params[:block].to_s.underscore
                 @user = User.current
                 # remove block in all groups
-                layout = @user.pref[:my_page_layout] || {}
+                layout = @user.pref.my_page_layout
                 %w(top left right).each {|f| (layout[f] ||= []).delete block }
-                @user.pref[:my_page_layout] = layout
+                @user.pref.my_page_layout = layout
                 @user.pref.save
                 redirect_to my_page_layout_path
               end
               # Change blocks order on user's page
               # params[:group] : group to order (top, left or right)
               # params[:list-(top|left|right)] : array of block ids of the group
               def order_blocks
                 group = params[:group]
                 @user = User.current
                 if group.is_a?(String)
                   group_items = (params["blocks"] || []).collect(&:underscore)
                   group_items.each {|s| s.sub!(/^block_/, '')}
                   if group_items and group_items.is_a? Array
-                    layout = @user.pref[:my_page_layout] || {}
+                    layout = @user.pref.my_page_layout
                     # remove group blocks if they are presents in other groups
                     %w(top left right).each {|f|
                       layout[f] = (layout[f] || []) - group_items
                     }
                     layout[group] = group_items
-                    @user.pref[:my_page_layout] = layout
+                    @user.pref.my_page_layout = layout
                     @user.pref.save
                   end
                 end
                 head 200
               end
             end

app/helpers/my_helper.rb +10 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             module MyHelper
               # Renders the blocks
               def render_blocks(blocks, user, options={})
                 s = ''.html_safe
                 if blocks.present?
                   blocks.each do |block|
                     content = render_block_content(block, user)
                     if content.present?
                       if options[:edit]
                         close = link_to(l(:button_delete), {:action => "remove_block", :block => block}, :method => 'post', :class => "icon-only icon-close")
                         content = close + content_tag('div', content, :class => 'handle')
                       end
                       s << content_tag('div', content, :class => "mypage-box", :id => "block-#{block}")
                     end
                   end
                 end
                 s
               end
               # Renders a single block content
               def render_block_content(block, user)
-                unless MyController::BLOCKS.keys.include?(block)
+                unless Redmine::MyPage.blocks.key?(block)
                   Rails.logger.warn("Unknown block \"#{block}\" found in #{user.login} (id=#{user.id}) preferences")
                   return
                 end
                 begin
                   render(:partial => "my/blocks/#{block}", :locals => {:user => user})
                 rescue ActionView::MissingTemplate
                   Rails.logger.warn("Template missing for block \"#{block}\" found in #{user.login} (id=#{user.id}) preferences")
                   return nil
                 end
               end
+              def block_select_tag(user)
+                disabled = user.pref.my_page_layout.values.flatten
+                options = content_tag('option')
+                Redmine::MyPage.block_options.each do |label, block|
+                  options << content_tag('option', label, :value => block, :disabled => disabled.include?(block))
+                end
+                content_tag('select', options, :id => "block-select")
+              end
               def calendar_items(startdt, enddt)
                 Issue.visible.
                   where(:project_id => User.current.projects.map(&:id)).
                   where("(start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)", startdt, enddt, startdt, enddt).
                   includes(:project, :tracker, :priority, :assigned_to).
                   references(:project, :tracker, :priority, :assigned_to).
                   to_a
               end
               def documents_items
                 Document.visible.order("#{Document.table_name}.created_on DESC").limit(10).to_a
               end
               def issuesassignedtome_items
                 Issue.visible.open.
                   assigned_to(User.current).
                   limit(10).
                   includes(:status, :project, :tracker, :priority).
                   references(:status, :project, :tracker, :priority).
                   order("#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC")
               end
               def issuesreportedbyme_items
                 Issue.visible.open.
                   where(:author_id => User.current.id).
                   limit(10).
                   includes(:status, :project, :tracker).
                   references(:status, :project, :tracker).
                   order("#{Issue.table_name}.updated_on DESC")
               end
               def issueswatched_items
                 Issue.visible.open.on_active_project.watched_by(User.current.id).recently_updated.limit(10)
               end
               def news_items
                 News.visible.
                   where(:project_id => User.current.projects.map(&:id)).
                   limit(10).
                   includes(:project, :author).
                   references(:project, :author).
                   order("#{News.table_name}.created_on DESC").
                   to_a
               end
               def timelog_items
                 TimeEntry.
                   where("#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", User.current.id, User.current.today - 6, User.current.today).
                   joins(:activity, :project).
                   references(:issue => [:tracker, :status]).
                   includes(:issue => [:tracker, :status]).
                   order("#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC").
                   to_a
               end
             end

app/models/user_preference.rb +8 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             class UserPreference < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :user
               serialize :others
               attr_protected :others, :user_id
               before_save :set_others_hash
               safe_attributes 'hide_mail',
                 'time_zone',
                 'comments_sorting',
                 'warn_on_leaving_unsaved',
                 'no_self_notified',
                 'textarea_font'
               TEXTAREA_FONT_OPTIONS = ['monospace', 'proportional']
               def initialize(attributes=nil, *args)
                 super
                 if new_record? && !(attributes && attributes.key?(:hide_mail))
                   self.hide_mail = Setting.default_users_hide_mail?
                 end
                 if new_record? && !(attributes && attributes.key?(:no_self_notified))
                   self.no_self_notified = true
                 end
                 self.others ||= {}
               end
               def set_others_hash
                 self.others ||= {}
               end
               def [](attr_name)
                 if has_attribute? attr_name
                   super
                 else
                   others ? others[attr_name] : nil
                 end
               end
               def []=(attr_name, value)
                 if has_attribute? attr_name
                   super
                 else
                   h = (read_attribute(:others) || {}).dup
                   h.update(attr_name => value)
                   write_attribute(:others, h)
                   value
                 end
               end
               def comments_sorting; self[:comments_sorting] end
               def comments_sorting=(order); self[:comments_sorting]=order end
               def warn_on_leaving_unsaved; self[:warn_on_leaving_unsaved] || '1'; end
               def warn_on_leaving_unsaved=(value); self[:warn_on_leaving_unsaved]=value; end
               def no_self_notified; (self[:no_self_notified] == true || self[:no_self_notified] == '1'); end
               def no_self_notified=(value); self[:no_self_notified]=value; end
               def activity_scope; Array(self[:activity_scope]) ; end
               def activity_scope=(value); self[:activity_scope]=value ; end
               def textarea_font; self[:textarea_font] end
               def textarea_font=(value); self[:textarea_font]=value; end
+              def my_page_layout
+                self[:my_page_layout] ||= Redmine::MyPage.default_layout.deep_dup
+              end
+              def my_page_layout=(arg)
+                self[:my_page_layout] = arg
+              end
             end

app/views/my/page_layout.html.erb +2 -5

             <div class="contextual">
-            <% if @block_options.present? %>
             <%= form_tag({:action => "add_block"}, :id => "block-form") do %>
               <%= label_tag('block-select', l(:label_my_page_block)) %>:
-              <%= select_tag 'block',
+              <%= block_select_tag(@user) %>
-                             content_tag('option') + options_for_select(@block_options),
-                             :id => "block-select" %>
               <%= link_to l(:button_add), '#', :onclick => '$("#block-form").submit()', :class => 'icon icon-add' %>
             <% end %>
-            <% end %>
             <%= link_to l(:button_back), {:action => 'page'}, :class => 'icon icon-cancel' %>
             </div>
             <h2><%=l(:label_my_page)%></h2>
             <div id="list-top" class="block-receiver">
               <%= render_blocks(@blocks['top'], @user, :edit => true) %>
             </div>
             <div id="list-left" class="splitcontentleft block-receiver">
               <%= render_blocks(@blocks['left'], @user, :edit => true) %>
             </div>
             <div id="list-right" class="splitcontentright block-receiver">
               <%= render_blocks(@blocks['right'], @user, :edit => true) %>
             </div>
             <%= javascript_tag "initMyPageSortable('top', '#{ escape_javascript url_for(:action => "order_blocks", :group => "top") }');" %>
             <%= javascript_tag "initMyPageSortable('left', '#{ escape_javascript url_for(:action => "order_blocks", :group => "left") }');" %>
             <%= javascript_tag "initMyPageSortable('right', '#{ escape_javascript url_for(:action => "order_blocks", :group => "right") }');" %>
             <% html_title(l(:label_my_page)) -%>

lib/redmine/my_page.rb ~~lib/redmine/views/my_page/block.rb~~ renamed +33 -3

             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             module Redmine
-              module Views
               module MyPage
-                  module Block
+                include Redmine::I18n
+                CORE_BLOCKS = {
+                    'issuesassignedtome' => :label_assigned_to_me_issues,
+                    'issuesreportedbyme' => :label_reported_issues,
+                    'issueswatched' => :label_watched_issues,
+                    'news' => :label_news_latest,
+                    'calendar' => :label_calendar,
+                    'documents' => :label_document_plural,
+                    'timelog' => :label_spent_time
+                  }
+                # Returns the available blocks
+                def self.blocks
+                  CORE_BLOCKS.merge(additional_blocks).freeze
+                end
+                def self.block_options
+                  options = []
+                  blocks.each do |k, v|
+                    options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize]
+                  end
+                  options
+                end
+                # Returns the additional blocks that are defined by plugin partials
                 def self.additional_blocks
                   @@additional_blocks ||= Dir.glob("#{Redmine::Plugin.directory}/*/app/views/my/blocks/_*.{rhtml,erb}").inject({}) do |h,file|
                     name = File.basename(file).split('.').first.gsub(/^_/, '')
                     h[name] = name.to_sym
                     h
                   end
                 end
-                  end
+                # Returns the default layout for My Page
+                def self.default_layout
+                  {
+                    'left' => ['issuesassignedtome'],
+                    'right' => ['issuesreportedbyme']
+                  }
                 end
               end
             end

test/functional/my_controller_test.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2016  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__)
             class MyControllerTest < Redmine::ControllerTest
               fixtures :users, :email_addresses, :user_preferences, :roles, :projects, :members, :member_roles,
               :issues, :issue_statuses, :trackers, :enumerations, :custom_fields, :auth_sources
               def setup
                 @request.session[:user_id] = 2
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_select 'h2', 'My page'
               end
               def test_page
                 get :page
                 assert_response :success
                 assert_select 'h2', 'My page'
               end
               def test_page_with_timelog_block
                 preferences = User.find(2).pref
                 preferences[:my_page_layout] = {'top' => ['timelog']}
                 preferences.save!
                 TimeEntry.create!(:user => User.find(2), :spent_on => Date.yesterday, :issue_id => 1, :hours => 2.5, :activity_id => 10)
                 get :page
                 assert_response :success
                 assert_select 'tr.time-entry' do
                   assert_select 'td.subject a[href="/issues/1"]'
                   assert_select 'td.hours', :text => '2.50'
                 end
               end
               def test_page_with_all_blocks
-                blocks = MyController::BLOCKS.keys
+                blocks = Redmine::MyPage.blocks.keys
                 preferences = User.find(2).pref
                 preferences[:my_page_layout] = {'top' => blocks}
                 preferences.save!
                 get :page
                 assert_response :success
                 assert_select 'div.mypage-box', blocks.size
               end
               def test_my_account_should_show_editable_custom_fields
                 get :account
                 assert_response :success
                 assert_select 'input[name=?]', 'user[custom_field_values][4]'
               end
               def test_my_account_should_not_show_non_editable_custom_fields
                 UserCustomField.find(4).update_attribute :editable, false
                 get :account
                 assert_response :success
                 assert_select 'input[name=?]', 'user[custom_field_values][4]', 0
               end
               def test_my_account_should_show_language_select
                 get :account
                 assert_response :success
                 assert_select 'select[name=?]', 'user[language]'
               end
               def test_my_account_should_not_show_language_select_with_force_default_language_for_loggedin
                 with_settings :force_default_language_for_loggedin => '1' do
                   get :account
                   assert_response :success
                   assert_select 'select[name=?]', 'user[language]', 0
                 end
               end
               def test_update_account
                 post :account,
                   :user => {
                     :firstname => "Joe",
                     :login => "root",
                     :admin => 1,
                     :group_ids => ['10'],
                     :custom_field_values => {"4" => "0100562500"}
                   }
                 assert_redirected_to '/my/account'
                 user = User.find(2)
                 assert_equal "Joe", user.firstname
                 assert_equal "jsmith", user.login
                 assert_equal "0100562500", user.custom_value_for(4).value
                 # ignored
                 assert !user.admin?
                 assert user.groups.empty?
               end
               def test_update_account_should_send_security_notification
                 ActionMailer::Base.deliveries.clear
                 post :account,
                   :user => {
                     :mail => 'foobar@example.com'
                   }
                 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
                 assert_mail_body_match '0.0.0.0', mail
                 assert_mail_body_match I18n.t(:mail_body_security_notification_change_to, field: I18n.t(:field_mail), value: 'foobar@example.com'), mail
                 assert_select_email do
                   assert_select 'a[href^=?]', 'http://localhost:3000/my/account', :text => 'My account'
                 end
                 # The old email address should be notified about the change for security purposes
                 assert [mail.bcc, mail.cc].flatten.include?(User.find(2).mail)
                 assert [mail.bcc, mail.cc].flatten.include?('foobar@example.com')
               end
               def test_my_account_should_show_destroy_link
                 get :account
                 assert_select 'a[href="/my/account/destroy"]'
               end
               def test_get_destroy_should_display_the_destroy_confirmation
                 get :destroy
                 assert_response :success
                 assert_select 'form[action="/my/account/destroy"]' do
                   assert_select 'input[name=confirm]'
                 end
               end
               def test_post_destroy_without_confirmation_should_not_destroy_account
                 assert_no_difference 'User.count' do
                   post :destroy
                 end
                 assert_response :success
               end
               def test_post_destroy_without_confirmation_should_destroy_account
                 assert_difference 'User.count', -1 do
                   post :destroy, :confirm => '1'
                 end
                 assert_redirected_to '/'
                 assert_match /deleted/i, flash[:notice]
               end
               def test_post_destroy_with_unsubscribe_not_allowed_should_not_destroy_account
                 User.any_instance.stubs(:own_account_deletable?).returns(false)
                 assert_no_difference 'User.count' do
                   post :destroy, :confirm => '1'
                 end
                 assert_redirected_to '/my/account'
               end
               def test_change_password
                 get :password
                 assert_response :success
                 assert_select 'input[type=password][name=password]'
                 assert_select 'input[type=password][name=new_password]'
                 assert_select 'input[type=password][name=new_password_confirmation]'
               end
               def test_update_password
                 post :password, :password => 'jsmith',
                                 :new_password => 'secret123',
                                 :new_password_confirmation => 'secret123'
                 assert_redirected_to '/my/account'
                 assert User.try_to_login('jsmith', 'secret123')
               end
               def test_update_password_with_non_matching_confirmation
                 post :password, :password => 'jsmith',
                                 :new_password => 'secret123',
                                 :new_password_confirmation => 'secret1234'
                 assert_response :success
                 assert_select_error /Password doesn.*t match confirmation/
                 assert User.try_to_login('jsmith', 'jsmith')
               end
               def test_update_password_with_wrong_password
                 # wrong password
                 post :password, :password => 'wrongpassword',
                                 :new_password => 'secret123',
                                 :new_password_confirmation => 'secret123'
                 assert_response :success
                 assert_equal 'Wrong password', flash[:error]
                 assert User.try_to_login('jsmith', 'jsmith')
               end
               def test_change_password_should_redirect_if_user_cannot_change_its_password
                 User.find(2).update_attribute(:auth_source_id, 1)
                 get :password
                 assert_not_nil flash[:error]
                 assert_redirected_to '/my/account'
               end
               def test_update_password_should_send_security_notification
                 ActionMailer::Base.deliveries.clear
                 post :password, :password => 'jsmith',
                                 :new_password => 'secret123',
                                 :new_password_confirmation => 'secret123'
                 assert_not_nil (mail = ActionMailer::Base.deliveries.last)
                 assert_mail_body_no_match 'secret123', mail # just to be sure: pw should never be sent!
                 assert_select_email do
                   assert_select 'a[href^=?]', 'http://localhost:3000/my/password', :text => 'Change password'
                 end
               end
               def test_page_layout
                 get :page_layout
                 assert_response :success
               end
               def test_add_block
                 post :add_block, :block => 'issuesreportedbyme'
                 assert_redirected_to '/my/page_layout'
                 assert User.find(2).pref[:my_page_layout]['top'].include?('issuesreportedbyme')
               end
               def test_add_invalid_block_should_redirect
                 post :add_block, :block => 'invalid'
                 assert_redirected_to '/my/page_layout'
               end
               def test_remove_block
                 post :remove_block, :block => 'issuesassignedtome'
                 assert_redirected_to '/my/page_layout'
                 assert !User.find(2).pref[:my_page_layout].values.flatten.include?('issuesassignedtome')
               end
               def test_order_blocks
                 xhr :post, :order_blocks, :group => 'left', 'blocks' => ['documents', 'calendar', 'latestnews']
                 assert_response :success
                 assert_equal ['documents', 'calendar', 'latestnews'], User.find(2).pref[:my_page_layout]['left']
               end
               def test_reset_rss_key_with_existing_key
                 @previous_token_value = User.find(2).rss_key # Will generate one if it's missing
                 post :reset_rss_key
                 assert_not_equal @previous_token_value, User.find(2).rss_key
                 assert User.find(2).rss_token
                 assert_match /reset/, flash[:notice]
                 assert_redirected_to '/my/account'
               end
               def test_reset_rss_key_without_existing_key
                 assert_nil User.find(2).rss_token
                 post :reset_rss_key
                 assert User.find(2).rss_token
                 assert_match /reset/, flash[:notice]
                 assert_redirected_to '/my/account'
               end
               def test_show_api_key
                 get :show_api_key
                 assert_response :success
                 assert_select 'pre', User.find(2).api_key
               end
               def test_reset_api_key_with_existing_key
                 @previous_token_value = User.find(2).api_key # Will generate one if it's missing
                 post :reset_api_key
                 assert_not_equal @previous_token_value, User.find(2).api_key
                 assert User.find(2).api_token
                 assert_match /reset/, flash[:notice]
                 assert_redirected_to '/my/account'
               end
               def test_reset_api_key_without_existing_key
                 assert_nil User.find(2).api_token
                 post :reset_api_key
                 assert User.find(2).api_token
                 assert_match /reset/, flash[:notice]
                 assert_redirected_to '/my/account'
               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