jro_apps/redmine Commit - r10255:838025372dc3

Potential can't dup NilClass error in UserPreference (#11905)....

Jean-Philippe Lang -

r10255:838025372dc3

parent child

Context file:

r10255:838025372dc3

Collapse all files

app/models/user_preference.rb +1 -1

             # 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.
             class UserPreference < ActiveRecord::Base
               belongs_to :user
               serialize :others
               attr_protected :others, :user_id
               before_save :set_others_hash
               def initialize(attributes=nil, *args)
                 super
                 self.others ||= {}
               end
               def set_others_hash
                 self.others ||= {}
               end
               def [](attr_name)
                 if attribute_present? attr_name
                   super
                 else
                   others ? others[attr_name] : nil
                 end
               end
               def []=(attr_name, value)
                 if attribute_present? attr_name
                   super
                 else
-                  h = read_attribute(:others).dup || {}
+                  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
             end

test/unit/user_preference_test.rb +15 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__)
             class UserPreferenceTest < ActiveSupport::TestCase
               fixtures :users, :user_preferences
               def test_create
                 user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo")
                 user.login = "newuser"
                 user.password, user.password_confirmation = "password", "password"
                 assert user.save
                 assert_kind_of UserPreference, user.pref
                 assert_kind_of Hash, user.pref.others
                 assert user.pref.save
               end
               def test_update
                 user = User.find(1)
                 assert_equal true, user.pref.hide_mail
                 user.pref['preftest'] = 'value'
                 assert user.pref.save
                 user.reload
                 assert_equal 'value', user.pref['preftest']
               end
               def test_others_hash
                 user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo")
                 user.login = "newuser"
                 user.password, user.password_confirmation = "password", "password"
                 assert user.save
                 assert_nil user.preference
                 up = UserPreference.new(:user => user)
                 assert_kind_of Hash, up.others
                 up.others = nil
                 assert_nil up.others
                 assert up.save
                 assert_kind_of Hash, up.others
               end
+              def test_reading_value_from_nil_others_hash
+                up = UserPreference.new(:user => User.new)
+                up.others = nil
+                assert_nil up.others
+                assert_nil up[:foo]
+              end
+              def test_writing_value_to_nil_others_hash
+                up = UserPreference.new(:user => User.new)
+                up.others = nil
+                assert_nil up.others
+                up[:foo] = 'bar'
+                assert_equal 'bar', up[:foo]
+              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