diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-09 14:11:21 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-09 14:11:21 -0800 |
| commit | bbc87dbc81eecd48567ab06810c6d5d8d9be5573 (patch) | |
| tree | 1e19c7a7fececd91043e99ea4bfa23aecefb751e /activerecord/test | |
| parent | ddd034f3a6570d3522471fbe173162a24879df4b (diff) | |
| parent | ad1a24f0e04ccff17df604c7781f4805ace2ec0f (diff) | |
| download | rails-bbc87dbc81eecd48567ab06810c6d5d8d9be5573.tar.gz rails-bbc87dbc81eecd48567ab06810c6d5d8d9be5573.tar.bz2 rails-bbc87dbc81eecd48567ab06810c6d5d8d9be5573.zip | |
Merge pull request #9633 from senny/5321_make_it_lazy
Uniqueness validation uses a proc to specify the `:conditions` option.
This is a follow up to #5321 and follows the general direction in
AR to make things lazy evaluated.
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/validations/uniqueness_validation_test.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/test/cases/validations/uniqueness_validation_test.rb b/activerecord/test/cases/validations/uniqueness_validation_test.rb index 46e767af1a..150e3c5461 100644 --- a/activerecord/test/cases/validations/uniqueness_validation_test.rb +++ b/activerecord/test/cases/validations/uniqueness_validation_test.rb @@ -348,7 +348,7 @@ class UniquenessValidationTest < ActiveRecord::TestCase end def test_validate_uniqueness_with_conditions - Topic.validates_uniqueness_of(:title, :conditions => Topic.where('approved = ?', true)) + Topic.validates_uniqueness_of :title, conditions: -> { where('approved = ?', true) } Topic.create("title" => "I'm a topic", "approved" => true) Topic.create("title" => "I'm an unapproved topic", "approved" => false) @@ -359,6 +359,12 @@ class UniquenessValidationTest < ActiveRecord::TestCase assert t4.valid?, "t4 should be valid" end + def test_validate_uniqueness_with_non_callable_conditions_is_not_supported + assert_raises(ArgumentError) { + Topic.validates_uniqueness_of :title, conditions: Topic.where('approved = ?', true) + } + end + def test_validate_uniqueness_with_array_column return skip "Uniqueness on arrays has only been tested in PostgreSQL so far." if !current_adapter? :PostgreSQLAdapter |