##// END OF EJS Templates
jro_apps » redmine
RSS
Potential can't dup NilClass error in UserPreference (#11905)....
Jean-Philippe Lang -
r10255:838025372dc3
parent child
Show More
Side by Side Unified
Context file:
r10255:838025372dc3 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,59 +1,59
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class UserPreference < ActiveRecord::Base
19 19 belongs_to :user
20 20 serialize :others
21 21
22 22 attr_protected :others, :user_id
23 23
24 24 before_save :set_others_hash
25 25
26 26 def initialize(attributes=nil, *args)
27 27 super
28 28 self.others ||= {}
29 29 end
30 30
31 31 def set_others_hash
32 32 self.others ||= {}
33 33 end
34 34
35 35 def [](attr_name)
36 36 if attribute_present? attr_name
37 37 super
38 38 else
39 39 others ? others[attr_name] : nil
40 40 end
41 41 end
42 42
43 43 def []=(attr_name, value)
44 44 if attribute_present? attr_name
45 45 super
46 46 else
47 h = read_attribute(:others).dup || {}
47 h = (read_attribute(:others) || {}).dup
48 48 h.update(attr_name => value)
49 49 write_attribute(:others, h)
50 50 value
51 51 end
52 52 end
53 53
54 54 def comments_sorting; self[:comments_sorting] end
55 55 def comments_sorting=(order); self[:comments_sorting]=order end
56 56
57 57 def warn_on_leaving_unsaved; self[:warn_on_leaving_unsaved] || '1'; end
58 58 def warn_on_leaving_unsaved=(value); self[:warn_on_leaving_unsaved]=value; end
59 59 end
Show file before | Show file after | Hide comments
@@ -1,57 +1,72
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../test_helper', __FILE__)
19 19
20 20 class UserPreferenceTest < ActiveSupport::TestCase
21 21 fixtures :users, :user_preferences
22 22
23 23 def test_create
24 24 user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo")
25 25 user.login = "newuser"
26 26 user.password, user.password_confirmation = "password", "password"
27 27 assert user.save
28 28
29 29 assert_kind_of UserPreference, user.pref
30 30 assert_kind_of Hash, user.pref.others
31 31 assert user.pref.save
32 32 end
33 33
34 34 def test_update
35 35 user = User.find(1)
36 36 assert_equal true, user.pref.hide_mail
37 37 user.pref['preftest'] = 'value'
38 38 assert user.pref.save
39 39
40 40 user.reload
41 41 assert_equal 'value', user.pref['preftest']
42 42 end
43 43
44 44 def test_others_hash
45 45 user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo")
46 46 user.login = "newuser"
47 47 user.password, user.password_confirmation = "password", "password"
48 48 assert user.save
49 49 assert_nil user.preference
50 50 up = UserPreference.new(:user => user)
51 51 assert_kind_of Hash, up.others
52 52 up.others = nil
53 53 assert_nil up.others
54 54 assert up.save
55 55 assert_kind_of Hash, up.others
56 56 end
57
58 def test_reading_value_from_nil_others_hash
59 up = UserPreference.new(:user => User.new)
60 up.others = nil
61 assert_nil up.others
62 assert_nil up[:foo]
63 end
64
65 def test_writing_value_to_nil_others_hash
66 up = UserPreference.new(:user => User.new)
67 up.others = nil
68 assert_nil up.others
69 up[:foo] = 'bar'
70 assert_equal 'bar', up[:foo]
71 end
57 72 end
General Comments 0
You need to be logged in to leave comments. Login now