diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-03 16:41:56 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-03 16:41:56 -0500 |
| commit | 362203e8039328b2827f5ee8bc73af46000f1d78 (patch) | |
| tree | df11e8eb468b6b22540d7127a698966257848bf2 /activerecord/test | |
| parent | ae110ce5d4de8cb3a22f826b0e824f333d2b2742 (diff) | |
| parent | 815c9deae8de557688e1c99aabe30454bcbe5970 (diff) | |
| download | rails-362203e8039328b2827f5ee8bc73af46000f1d78.tar.gz rails-362203e8039328b2827f5ee8bc73af46000f1d78.tar.bz2 rails-362203e8039328b2827f5ee8bc73af46000f1d78.zip | |
Merge pull request #14582 from arthurnn/blacklist_ruby_methods
Blacklist ruby keywords for scopes
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/enum_test.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/scoping/named_scoping_test.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/cases/enum_test.rb b/activerecord/test/cases/enum_test.rb index f8ebd7caee..47de3dec98 100644 --- a/activerecord/test/cases/enum_test.rb +++ b/activerecord/test/cases/enum_test.rb @@ -194,6 +194,7 @@ class EnumTest < ActiveRecord::TestCase :valid, # generates #valid?, which conflicts with an AR method :save, # generates #save!, which conflicts with an AR method :proposed, # same value as an existing enum + :public, :private, :protected, # generates a method that conflict with ruby words ] conflicts.each_with_index do |value, i| diff --git a/activerecord/test/cases/scoping/named_scoping_test.rb b/activerecord/test/cases/scoping/named_scoping_test.rb index f0ad9ebb8a..59ec2dd6a4 100644 --- a/activerecord/test/cases/scoping/named_scoping_test.rb +++ b/activerecord/test/cases/scoping/named_scoping_test.rb @@ -291,6 +291,9 @@ class NamedScopingTest < ActiveRecord::TestCase :relation, # private class method on AR::Base :new, # redefined class method on AR::Base :all, # a default scope + :public, + :protected, + :private ] non_conflicts = [ |