Skip to content

Commit

Permalink
validates_confirmation_of does not override writer methods.
Browse files Browse the repository at this point in the history
  • Loading branch information
senny committed Mar 4, 2013
1 parent b359c5d commit b501ee4
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 1 deletion.
15 changes: 15 additions & 0 deletions activemodel/CHANGELOG.md
@@ -1,5 +1,20 @@
## Rails 4.0.0 (unreleased) ##

* `validates_confirmation_of` does not override writer methods for
the confirmation attribute if no reader is defined.

Example:

class Blog
def title=(new_title)

This comment has been minimized.

Copy link
@josevalim

josevalim May 20, 2013

Contributor

Isn't this the wrong indentation?

This comment has been minimized.

Copy link
@senny

senny May 20, 2013

Author Member

it is but looks like it was fixed on 4-0-stable and it's not on master anymore:

@title = new_title.downcase
end

# previously this would override the setter above.
validates_confirmation_of :title
end

*Yves Senn*

## Rails 4.0.0.beta1 (February 25, 2013) ##

Expand Down
6 changes: 5 additions & 1 deletion activemodel/lib/active_model/validations/confirmation.rb
Expand Up @@ -10,9 +10,13 @@ def validate_each(record, attribute, value)
end

def setup(klass)
klass.send(:attr_accessor, *attributes.map do |attribute|
klass.send(:attr_reader, *attributes.map do |attribute|
:"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation")
end.compact)

klass.send(:attr_writer, *attributes.map do |attribute|
:"#{attribute}_confirmation" unless klass.method_defined?(:"#{attribute}_confirmation=")
end.compact)
end
end

Expand Down
31 changes: 31 additions & 0 deletions activemodel/test/cases/validations/confirmation_validation_test.rb
Expand Up @@ -71,4 +71,35 @@ def test_title_confirmation_with_i18n_attribute
I18n.backend = @old_backend
end

test "does not override confirmation reader if present" do
klass = Class.new do
include ActiveModel::Validations

def title_confirmation
"expected title"
end

validates_confirmation_of :title
end

assert_equal "expected title", klass.new.title_confirmation,
"confirmation validation should not override the reader"
end

test "does not override confirmation writer if present" do
klass = Class.new do
include ActiveModel::Validations

def title_confirmation=(value)
@title_confirmation = "expected title"
end

validates_confirmation_of :title
end

model = klass.new
model.title_confirmation = "new title"
assert_equal "expected title", model.title_confirmation,
"confirmation validation should not override the writer"
end
end

0 comments on commit b501ee4

Please sign in to comment.