diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2015-12-16 13:54:02 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2015-12-16 13:54:02 -0200 |
| commit | b7a7e82207efd24d685fc1325fb523f047ca2ce1 (patch) | |
| tree | 4fdaf223271dcb9eed500ed184365bdc4b159629 /activemodel/test | |
| parent | cf01e4e797e0c9162686babbb670f84481305d98 (diff) | |
| parent | 21f4017fd904532ebe4964481567d69636a711cf (diff) | |
| download | rails-b7a7e82207efd24d685fc1325fb523f047ca2ce1.tar.gz rails-b7a7e82207efd24d685fc1325fb523f047ca2ce1.tar.bz2 rails-b7a7e82207efd24d685fc1325fb523f047ca2ce1.zip | |
Merge pull request #22598 from yui-knk/deprecate_string_callback
Deprecate passing string to define callback.
Diffstat (limited to 'activemodel/test')
| -rw-r--r-- | activemodel/test/cases/callbacks_test.rb | 2 | ||||
| -rw-r--r-- | activemodel/test/cases/validations/with_validation_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activemodel/test/cases/callbacks_test.rb b/activemodel/test/cases/callbacks_test.rb index 85455c112c..e4ecc0adb4 100644 --- a/activemodel/test/cases/callbacks_test.rb +++ b/activemodel/test/cases/callbacks_test.rb @@ -28,7 +28,7 @@ class CallbacksTest < ActiveModel::TestCase false end - after_create "@callbacks << :final_callback" + ActiveSupport::Deprecation.silence { after_create "@callbacks << :final_callback" } def initialize(options = {}) @callbacks = [] diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb index 03c7943308..c73580138d 100644 --- a/activemodel/test/cases/validations/with_validation_test.rb +++ b/activemodel/test/cases/validations/with_validation_test.rb @@ -101,6 +101,7 @@ class ValidatesWithTest < ActiveModel::TestCase validator.expect(:new, validator, [{foo: :bar, if: "1 == 1", class: Topic}]) validator.expect(:validate, nil, [topic]) validator.expect(:is_a?, false, [Symbol]) + validator.expect(:is_a?, false, [String]) Topic.validates_with(validator, if: "1 == 1", foo: :bar) assert topic.valid? |