diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-03-13 11:48:07 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-03-13 11:48:07 -0700 |
| commit | 7658dc37a40077444fee1eafcf4a59fae1b441a5 (patch) | |
| tree | c8bed932dc82fc245f61838fb74d6a3d46f6ae90 /activerecord/test/cases/validations/uniqueness_validation_test.rb | |
| parent | d99974b27cac1d3ed3af6bef0b7551044a8c9923 (diff) | |
| parent | d35f0033c7dec2b8d8b52058fb8db495d49596f7 (diff) | |
| download | rails-7658dc37a40077444fee1eafcf4a59fae1b441a5.tar.gz rails-7658dc37a40077444fee1eafcf4a59fae1b441a5.tar.bz2 rails-7658dc37a40077444fee1eafcf4a59fae1b441a5.zip | |
Merge branch 'master' into adequaterecord
* master:
passing an instance of an AR object to `find` is deprecated
passing an ActiveRecord object to `exists?` is deprecated.
Diffstat (limited to 'activerecord/test/cases/validations/uniqueness_validation_test.rb')
| -rw-r--r-- | activerecord/test/cases/validations/uniqueness_validation_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/validations/uniqueness_validation_test.rb b/activerecord/test/cases/validations/uniqueness_validation_test.rb index 74c696c858..18221cc73d 100644 --- a/activerecord/test/cases/validations/uniqueness_validation_test.rb +++ b/activerecord/test/cases/validations/uniqueness_validation_test.rb @@ -223,7 +223,7 @@ class UniquenessValidationTest < ActiveRecord::TestCase assert t_utf8.save, "Should save t_utf8 as unique" # If database hasn't UTF-8 character set, this test fails - if Topic.all.merge!(:select => 'LOWER(title) AS title').find(t_utf8).title == "я тоже уникальный!" + if Topic.all.merge!(:select => 'LOWER(title) AS title').find(t_utf8.id).title == "я тоже уникальный!" t2_utf8 = Topic.new("title" => "я тоже УНИКАЛЬНЫЙ!") assert !t2_utf8.valid?, "Shouldn't be valid" assert !t2_utf8.save, "Shouldn't save t2_utf8 as unique" |