diff options
Diffstat (limited to 'activerecord/test/mixin_test.rb')
| -rw-r--r-- | activerecord/test/mixin_test.rb | 150 |
1 files changed, 75 insertions, 75 deletions
diff --git a/activerecord/test/mixin_test.rb b/activerecord/test/mixin_test.rb index 1efce934e2..bb6f9912a7 100644 --- a/activerecord/test/mixin_test.rb +++ b/activerecord/test/mixin_test.rb @@ -9,68 +9,68 @@ class ListTest < Test::Unit::TestCase def test_reordering - assert_equal [@mixins['list_1'].find, - @mixins['list_2'].find, - @mixins['list_3'].find, - @mixins['list_4'].find], + assert_equal [mixins(:list_1), + mixins(:list_2), + mixins(:list_3), + mixins(:list_4)], ListMixin.find_all("parent_id=5", "pos") - @mixins['list_2'].find.move_lower + mixins(:list_2).move_lower - assert_equal [@mixins['list_1'].find, - @mixins['list_3'].find, - @mixins['list_2'].find, - @mixins['list_4'].find], + assert_equal [mixins(:list_1), + mixins(:list_3), + mixins(:list_2), + mixins(:list_4)], ListMixin.find_all("parent_id=5", "pos") - @mixins['list_2'].find.move_higher + mixins(:list_2).move_higher - assert_equal [@mixins['list_1'].find, - @mixins['list_2'].find, - @mixins['list_3'].find, - @mixins['list_4'].find], + assert_equal [mixins(:list_1), + mixins(:list_2), + mixins(:list_3), + mixins(:list_4)], ListMixin.find_all("parent_id=5", "pos") - @mixins['list_1'].find.move_to_bottom + mixins(:list_1).move_to_bottom - assert_equal [@mixins['list_2'].find, - @mixins['list_3'].find, - @mixins['list_4'].find, - @mixins['list_1'].find], + assert_equal [mixins(:list_2), + mixins(:list_3), + mixins(:list_4), + mixins(:list_1)], ListMixin.find_all("parent_id=5", "pos") - @mixins['list_1'].find.move_to_top + mixins(:list_1).move_to_top - assert_equal [@mixins['list_1'].find, - @mixins['list_2'].find, - @mixins['list_3'].find, - @mixins['list_4'].find], + assert_equal [mixins(:list_1), + mixins(:list_2), + mixins(:list_3), + mixins(:list_4)], ListMixin.find_all("parent_id=5", "pos") - @mixins['list_2'].find.move_to_bottom + mixins(:list_2).move_to_bottom - assert_equal [@mixins['list_1'].find, - @mixins['list_3'].find, - @mixins['list_4'].find, - @mixins['list_2'].find], + assert_equal [mixins(:list_1), + mixins(:list_3), + mixins(:list_4), + mixins(:list_2)], ListMixin.find_all("parent_id=5", "pos") - @mixins['list_4'].find.move_to_top + mixins(:list_4).move_to_top - assert_equal [@mixins['list_4'].find, - @mixins['list_1'].find, - @mixins['list_3'].find, - @mixins['list_2'].find], + assert_equal [mixins(:list_4), + mixins(:list_1), + mixins(:list_3), + mixins(:list_2)], ListMixin.find_all("parent_id=5", "pos") end def test_next_prev - assert_equal @list_2, @list_1.lower_item - assert_nil @list_1.higher_item - assert_equal @list_3, @list_4.higher_item - assert_nil @list_4.lower_item + 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 @@ -130,31 +130,31 @@ class ListTest < Test::Unit::TestCase def test_delete_middle - assert_equal [@mixins['list_1'].find, - @mixins['list_2'].find, - @mixins['list_3'].find, - @mixins['list_4'].find], + assert_equal [mixins(:list_1), + mixins(:list_2), + mixins(:list_3), + mixins(:list_4)], ListMixin.find_all("parent_id=5", "pos") - @mixins['list_2'].find.destroy + mixins(:list_2).destroy - assert_equal [@mixins['list_1'].find, - @mixins['list_3'].find, - @mixins['list_4'].find], + assert_equal [mixins(:list_1, :reload), + mixins(:list_3, :reload), + mixins(:list_4, :reload)], ListMixin.find_all("parent_id=5", "pos") - assert_equal 1, @mixins['list_1'].find.pos - assert_equal 2, @mixins['list_3'].find.pos - assert_equal 3, @mixins['list_4'].find.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'].find.destroy + mixins(:list_1).destroy - assert_equal [@mixins['list_3'].find, - @mixins['list_4'].find], + assert_equal [mixins(:list_3, :reload), + mixins(:list_4, :reload)], ListMixin.find_all("parent_id=5", "pos") - assert_equal 1, @mixins['list_3'].find.pos - assert_equal 2, @mixins['list_4'].find.pos + assert_equal 1, mixins(:list_3).pos + assert_equal 2, mixins(:list_4).pos end @@ -176,42 +176,42 @@ class TreeTest < Test::Unit::TestCase fixtures :mixins def test_has_child - assert_equal true, @tree_1.has_children? - assert_equal true, @tree_2.has_children? - assert_equal false, @tree_3.has_children? - assert_equal false, @tree_4.has_children? + assert_equal true, mixins(:tree_1).has_children? + assert_equal true, mixins(:tree_2).has_children? + assert_equal false, mixins(:tree_3).has_children? + assert_equal false, mixins(:tree_4).has_children? end def test_children - assert_equal @tree_1.children, [@tree_2, @tree_4] - assert_equal @tree_2.children, [@tree_3] - assert_equal @tree_3.children, [] - assert_equal @tree_4.children, [] + assert_equal mixins(:tree_1).children, [mixins(:tree_2), mixins(:tree_4)] + assert_equal mixins(:tree_2).children, [mixins(:tree_3)] + assert_equal mixins(:tree_3).children, [] + assert_equal mixins(:tree_4).children, [] end def test_parent - assert_equal @tree_2.parent, @tree_1 - assert_equal @tree_2.parent, @tree_4.parent - assert_nil @tree_1.parent + assert_equal mixins(:tree_2).parent, mixins(:tree_1) + assert_equal mixins(:tree_2).parent, mixins(:tree_4).parent + assert_nil mixins(:tree_1).parent end def test_delete assert_equal 4, TreeMixin.count - @tree_1.destroy + mixins(:tree_1).destroy assert_equal 0, TreeMixin.count end def test_insert - @extra = @tree_1.children.create + @extra = mixins(:tree_1).children.create assert @extra - assert_equal @extra.parent, @tree_1 + assert_equal @extra.parent, mixins(:tree_1) - assert_equal 3, @tree_1.children.size - assert @tree_1.children.include?(@extra) - assert @tree_1.children.include?(@tree_2) - assert @tree_1.children.include?(@tree_4) + assert_equal 3, mixins(:tree_1).children.size + assert mixins(:tree_1).children.include?(@extra) + assert mixins(:tree_1).children.include?(mixins(:tree_2)) + assert mixins(:tree_1).children.include?(mixins(:tree_4)) end end @@ -258,9 +258,9 @@ class TouchTest < Test::Unit::TestCase def test_create_turned_off Mixin.record_timestamps = false - assert_nil @tree_1.updated_at - @tree_1.save - assert_nil @tree_1.updated_at + assert_nil mixins(:tree_1).updated_at + mixins(:tree_1).save + assert_nil mixins(:tree_1).updated_at Mixin.record_timestamps = true end |