diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-16 13:37:06 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-16 13:37:06 +0000 |
commit | 4d6bfc7a3615c68544ce10373e699eec1dfea669 (patch) | |
tree | 0792a1ebf10df58462638608ec769d14d20145bf /activerecord/test | |
parent | 2dbff3fbc0903b828949c57b13e2aa816d187dce (diff) | |
download | rails-4d6bfc7a3615c68544ce10373e699eec1dfea669.tar.gz rails-4d6bfc7a3615c68544ce10373e699eec1dfea669.tar.bz2 rails-4d6bfc7a3615c68544ce10373e699eec1dfea669.zip |
Added assumption that a Symbol-based scope should end in _id unless it does so already and that you can pass vanilla string-based scopes as a parameter
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@182 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/fixtures/mixin.rb | 2 | ||||
-rw-r--r-- | activerecord/test/mixin_test.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/test/fixtures/mixin.rb b/activerecord/test/fixtures/mixin.rb index 8cae604140..6da85e55e7 100644 --- a/activerecord/test/fixtures/mixin.rb +++ b/activerecord/test/fixtures/mixin.rb @@ -4,7 +4,7 @@ class Mixin < ActiveRecord::Base end class ListMixin < ActiveRecord::Base - acts_as_list :column => "pos", :scope => :parent_id + acts_as_list :column => "pos", :scope => :parent def self.table_name "mixins" diff --git a/activerecord/test/mixin_test.rb b/activerecord/test/mixin_test.rb index 31e71f5d6c..107d6d2f0a 100644 --- a/activerecord/test/mixin_test.rb +++ b/activerecord/test/mixin_test.rb @@ -1,7 +1,6 @@ require 'abstract_unit' require 'active_record/mixins/tree' require 'active_record/mixins/list' -require 'active_record/mixins/touch' require 'fixtures/mixin' |