diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-07-18 13:42:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 13:42:57 -0400 |
| commit | 36ff7b63ec083924a5b407cf3df7ae90e22183e2 (patch) | |
| tree | 8cbdbe138f13a0dc7c3666f036fda685c644d262 /activerecord/test/cases/attribute_methods/read_test.rb | |
| parent | 425ba83c28214ca97c5d3600c16ad7a796cd33e6 (diff) | |
| parent | f47bac481949a69a519ea7d833e1a8d435332d52 (diff) | |
| download | rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.tar.gz rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.tar.bz2 rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.zip | |
Merge branch 'master' into fix_unscope_where_column_with_or
Diffstat (limited to 'activerecord/test/cases/attribute_methods/read_test.rb')
| -rw-r--r-- | activerecord/test/cases/attribute_methods/read_test.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/test/cases/attribute_methods/read_test.rb b/activerecord/test/cases/attribute_methods/read_test.rb index 1fc63a49d4..934d5bf8b2 100644 --- a/activerecord/test/cases/attribute_methods/read_test.rb +++ b/activerecord/test/cases/attribute_methods/read_test.rb @@ -8,11 +8,10 @@ module ActiveRecord end def setup - @klass = Class.new do + @klass = Class.new(Class.new { def self.initialize_generated_modules; end }) do def self.superclass; Base; end def self.base_class; self; end def self.decorate_matching_attribute_types(*); end - def self.initialize_generated_modules; end include ActiveRecord::DefineCallbacks include ActiveRecord::AttributeMethods |