diff options
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/fixtures/mixin.rb | 18 | ||||
-rw-r--r-- | activerecord/test/fixtures/mixins.yml | 17 | ||||
-rw-r--r-- | activerecord/test/mixin_test.rb | 282 |
3 files changed, 0 insertions, 317 deletions
diff --git a/activerecord/test/fixtures/mixin.rb b/activerecord/test/fixtures/mixin.rb index 7f877a8ce8..5e40c397c0 100644 --- a/activerecord/test/fixtures/mixin.rb +++ b/activerecord/test/fixtures/mixin.rb @@ -15,24 +15,6 @@ class RecursivelyCascadedTreeMixin < Mixin has_one :first_child, :class_name => 'RecursivelyCascadedTreeMixin', :foreign_key => :parent_id end -class ListMixin < Mixin - acts_as_list :column => "pos", :scope => :parent - - def self.table_name() "mixins" end -end - -class ListMixinSub1 < ListMixin -end - -class ListMixinSub2 < ListMixin -end - - -class ListWithStringScopeMixin < ActiveRecord::Base - acts_as_list :column => "pos", :scope => 'parent_id = #{parent_id}' - - def self.table_name() "mixins" end -end class NestedSet < Mixin acts_as_nested_set :scope => "root_id IS NULL" diff --git a/activerecord/test/fixtures/mixins.yml b/activerecord/test/fixtures/mixins.yml index 1f5d3ba60b..6c66eb559c 100644 --- a/activerecord/test/fixtures/mixins.yml +++ b/activerecord/test/fixtures/mixins.yml @@ -59,15 +59,6 @@ recursively_cascaded_tree_4: type: RecursivelyCascadedTreeMixin parent_id: 5007 -# List mixins - -<% (1..4).each do |counter| %> -list_<%= counter %>: - id: <%= counter+1006 %> - pos: <%= counter %> - type: ListMixin - parent_id: 5 -<% end %> # Nested set mixins @@ -117,11 +108,3 @@ tree_<%= set[0] %>: <% end %> -# subclasses of list items -<% (1..4).each do |i| %> -list_sub_<%= i %>: - id: <%= i + 5000 %> - pos: <%= i %> - parent_id: 5000 - type: <%= (i % 2 == 1) ? ListMixinSub1 : ListMixinSub2 %> -<% end %> diff --git a/activerecord/test/mixin_test.rb b/activerecord/test/mixin_test.rb index 44a84f62c8..41310e2c83 100644 --- a/activerecord/test/mixin_test.rb +++ b/activerecord/test/mixin_test.rb @@ -1,6 +1,5 @@ require 'abstract_unit' require 'active_record/acts/tree' -require 'active_record/acts/list' require 'active_record/acts/nested_set' require 'fixtures/mixin' @@ -21,164 +20,6 @@ class Time end end -class ListTest < Test::Unit::TestCase - fixtures :mixins - - def test_reordering - assert_equal mixins(:list_1, :list_2, :list_3, :list_4), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - mixins(:list_2).move_lower - - assert_equal mixins(:list_1, :list_3, :list_2, :list_4), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - mixins(:list_2).move_higher - - assert_equal mixins(:list_1, :list_2, :list_3, :list_4), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - mixins(:list_1).move_to_bottom - - assert_equal mixins(:list_2, :list_3, :list_4, :list_1), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - mixins(:list_1).move_to_top - - assert_equal mixins(:list_1, :list_2, :list_3, :list_4), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - - mixins(:list_2).move_to_bottom - - assert_equal mixins(:list_1, :list_3, :list_4, :list_2), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - mixins(:list_4).move_to_top - - assert_equal mixins(:list_4, :list_1, :list_3, :list_2), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - end - - def test_move_to_bottom_with_next_to_last_item - assert_equal mixins(:list_1, :list_2, :list_3, :list_4), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - mixins(:list_3).move_to_bottom - - assert_equal mixins(:list_1, :list_2, :list_4, :list_3), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - end - - def test_next_prev - assert_equal mixins(:list_2), mixins(:list_1).lower_item - assert_nil mixins(:list_1).higher_item - assert_equal mixins(:list_3), mixins(:list_4).higher_item - assert_nil mixins(:list_4).lower_item - end - - - def test_injection - item = ListMixin.new("parent_id"=>1) - assert_equal "parent_id = 1", item.scope_condition - assert_equal "pos", item.position_column - end - - def test_insert - new = ListMixin.create("parent_id"=>20) - assert_equal 1, new.pos - assert new.first? - assert new.last? - - new = ListMixin.create("parent_id"=>20) - assert_equal 2, new.pos - assert !new.first? - assert new.last? - - new = ListMixin.create("parent_id"=>20) - assert_equal 3, new.pos - assert !new.first? - assert new.last? - - new = ListMixin.create("parent_id"=>0) - assert_equal 1, new.pos - assert new.first? - assert new.last? - end - - def test_insert_at - new = ListMixin.create("parent_id" => 20) - assert_equal 1, new.pos - - new = ListMixin.create("parent_id" => 20) - assert_equal 2, new.pos - - new = ListMixin.create("parent_id" => 20) - assert_equal 3, new.pos - - new4 = ListMixin.create("parent_id" => 20) - assert_equal 4, new4.pos - - new4.insert_at(3) - assert_equal 3, new4.pos - - new.reload - assert_equal 4, new.pos - - new.insert_at(2) - assert_equal 2, new.pos - - new4.reload - assert_equal 4, new4.pos - - new5 = ListMixin.create("parent_id" => 20) - assert_equal 5, new5.pos - - new5.insert_at(1) - assert_equal 1, new5.pos - - new4.reload - assert_equal 5, new4.pos - end - - def test_delete_middle - assert_equal mixins(:list_1, :list_2, :list_3, :list_4), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - mixins(:list_2).destroy - - assert_equal mixins(:list_1, :list_3, :list_4, :reload), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - assert_equal 1, mixins(:list_1).pos - assert_equal 2, mixins(:list_3).pos - assert_equal 3, mixins(:list_4).pos - - mixins(:list_1).destroy - - assert_equal mixins(:list_3, :list_4, :reload), - ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') - - assert_equal 1, mixins(:list_3).pos - assert_equal 2, mixins(:list_4).pos - - end - - def test_with_string_based_scope - new = ListWithStringScopeMixin.create("parent_id"=>500) - assert_equal 1, new.pos - assert new.first? - assert new.last? - end - - def test_nil_scope - new1, new2, new3 = ListMixin.create, ListMixin.create, ListMixin.create - new2.move_higher - assert_equal [new2, new1, new3], ListMixin.find(:all, :conditions => 'parent_id IS NULL', :order => 'pos') - end - -end class TreeTest < Test::Unit::TestCase fixtures :mixins @@ -339,128 +180,5 @@ class TouchTest < Test::Unit::TestCase end -class ListSubTest < Test::Unit::TestCase - fixtures :mixins - - def test_reordering - assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_3, :list_sub_4), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - mixins(:list_sub_2).move_lower - - assert_equal mixins(:list_sub_1, :list_sub_3, :list_sub_2, :list_sub_4), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - mixins(:list_sub_2).move_higher - - assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_3, :list_sub_4), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - mixins(:list_sub_1).move_to_bottom - - assert_equal mixins(:list_sub_2, :list_sub_3, :list_sub_4, :list_sub_1), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - mixins(:list_sub_1).move_to_top - - assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_3, :list_sub_4), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - - mixins(:list_sub_2).move_to_bottom - - assert_equal mixins(:list_sub_1, :list_sub_3, :list_sub_4, :list_sub_2), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - mixins(:list_sub_4).move_to_top - - assert_equal mixins(:list_sub_4, :list_sub_1, :list_sub_3, :list_sub_2), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - end - - def test_move_to_bottom_with_next_to_last_item - assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_3, :list_sub_4), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - mixins(:list_sub_3).move_to_bottom - - assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_4, :list_sub_3), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - end - - def test_next_prev - assert_equal mixins(:list_sub_2), mixins(:list_sub_1).lower_item - assert_nil mixins(:list_sub_1).higher_item - assert_equal mixins(:list_sub_3), mixins(:list_sub_4).higher_item - assert_nil mixins(:list_sub_4).lower_item - end - - - def test_injection - item = ListMixin.new("parent_id"=>1) - assert_equal "parent_id = 1", item.scope_condition - assert_equal "pos", item.position_column - end - - - def test_insert_at - new = ListMixin.create("parent_id" => 20) - assert_equal 1, new.pos - - new = ListMixinSub1.create("parent_id" => 20) - assert_equal 2, new.pos - - new = ListMixinSub2.create("parent_id" => 20) - assert_equal 3, new.pos - - new4 = ListMixin.create("parent_id" => 20) - assert_equal 4, new4.pos - - new4.insert_at(3) - assert_equal 3, new4.pos - - new.reload - assert_equal 4, new.pos - - new.insert_at(2) - assert_equal 2, new.pos - - new4.reload - assert_equal 4, new4.pos - - new5 = ListMixinSub1.create("parent_id" => 20) - assert_equal 5, new5.pos - new5.insert_at(1) - assert_equal 1, new5.pos - - new4.reload - assert_equal 5, new4.pos - end - - def test_delete_middle - assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_3, :list_sub_4), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - mixins(:list_sub_2).destroy - - assert_equal mixins(:list_sub_1, :list_sub_3, :list_sub_4, :reload), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - assert_equal 1, mixins(:list_sub_1).pos - assert_equal 2, mixins(:list_sub_3).pos - assert_equal 3, mixins(:list_sub_4).pos - - mixins(:list_sub_1).destroy - - assert_equal mixins(:list_sub_3, :list_sub_4, :reload), - ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') - - assert_equal 1, mixins(:list_sub_3).pos - assert_equal 2, mixins(:list_sub_4).pos - - end - -end |