diff options
author | Jeremy Walker <jeremy@meducation.net> | 2012-08-09 12:44:59 +0100 |
---|---|---|
committer | Jeremy Walker <jeremy@meducation.net> | 2012-08-09 12:44:59 +0100 |
commit | 2a6039a81027a4f0f3f9fc4d95b6bba7323af28d (patch) | |
tree | daba0fa6fd00d60d1f36380880a05dc1e0ad9ef0 /activerecord/test | |
parent | 2e98e0f38607d34a6cca8f9f7c5a4f318d681408 (diff) | |
download | rails-2a6039a81027a4f0f3f9fc4d95b6bba7323af28d.tar.gz rails-2a6039a81027a4f0f3f9fc4d95b6bba7323af28d.tar.bz2 rails-2a6039a81027a4f0f3f9fc4d95b6bba7323af28d.zip |
Ported PR #4856 to 3-2-stable.
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/store_test.rb | 11 | ||||
-rw-r--r-- | activerecord/test/models/admin/user.rb | 1 | ||||
-rw-r--r-- | activerecord/test/schema/schema.rb | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb index 5a3f9a9711..277fc9d676 100644 --- a/activerecord/test/cases/store_test.rb +++ b/activerecord/test/cases/store_test.rb @@ -4,7 +4,7 @@ require 'models/admin/user' class StoreTest < ActiveRecord::TestCase setup do - @john = Admin::User.create(:name => 'John Doe', :color => 'black') + @john = Admin::User.create(:name => 'John Doe', :color => 'black', :remember_login => true) end test "reading store attributes through accessors" do @@ -31,4 +31,13 @@ class StoreTest < ActiveRecord::TestCase @john.color = 'red' assert @john.settings_changed? end + + test "object initialization with not nullable column" do + assert_equal true, @john.remember_login + end + + test "writing with not nullable column" do + @john.remember_login = false + assert_equal false, @john.remember_login + end end diff --git a/activerecord/test/models/admin/user.rb b/activerecord/test/models/admin/user.rb index c12c88e195..d0e628bd50 100644 --- a/activerecord/test/models/admin/user.rb +++ b/activerecord/test/models/admin/user.rb @@ -1,4 +1,5 @@ class Admin::User < ActiveRecord::Base belongs_to :account store :settings, :accessors => [ :color, :homepage ] + store :preferences, :accessors => [ :remember_login ] end diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index d6eed1552f..15be4f0954 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -37,7 +37,8 @@ ActiveRecord::Schema.define do create_table :admin_users, :force => true do |t| t.string :name - t.text :settings + t.text :settings, :null => true + t.text :preferences, :null => false, :default => "" t.references :account end |