aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-09-08 13:12:05 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-09-08 13:12:05 -0300
commitff83868b10001af74c6f258e878bb29be6425c8d (patch)
treea49cbce351c97c695532d11dd3d105e0d89d69ef /activemodel/lib
parent8d1af2b10c02ab5ecd32be0d2a5b1f937ddd25e1 (diff)
parente3d99e239dd1b59d31ac90f74186ded8b55de599 (diff)
downloadrails-ff83868b10001af74c6f258e878bb29be6425c8d.tar.gz
rails-ff83868b10001af74c6f258e878bb29be6425c8d.tar.bz2
rails-ff83868b10001af74c6f258e878bb29be6425c8d.zip
Merge pull request #21535 from dmitry/feature/validate-multiple-contexts
Validate multiple contexts on `valid?` and `invalid?` at once
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/validations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 5f1dde4aa3..f23c920d87 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -162,7 +162,7 @@ module ActiveModel
options = options.dup
options[:if] = Array(options[:if])
options[:if].unshift ->(o) {
- Array(options[:on]).include?(o.validation_context)
+ !(Array(options[:on]) & Array(o.validation_context)).empty?
}
end