Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 7081

Show
Ignore:
Timestamp:
06/22/07 17:36:20 (3 years ago)
Author:
bitsweat
Message:

Update tests' use of fixtures for the new collections api. Closes #8726.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/activerecord/CHANGELOG

    r7075 r7081  
    11*SVN* 
     2 
     3* Update tests' use of fixtures for the new collections api.  #8726 [kamal] 
    24 
    35* Save associated records only if the association is already loaded.  #8713 [blaine] 

  • trunk/activerecord/test/associations_test.rb

    r7075 r7081  
    951951    core = companies(:rails_core) 
    952952    assert_equal accounts(:rails_core_account), core.account 
    953     assert_equal [companies(:leetsoft), companies(:jadedpixel)], core.companies 
     953    assert_equal companies(:leetsoft, :jadedpixel), core.companies 
    954954    core.destroy 
    955955    assert_nil accounts(:rails_core_account).reload.firm_id 
    …… 
    985985  def test_replace_with_new 
    986986    firm = Firm.find(:first) 
    987     new_client = Client.new("name" => "New Client") 
    988     firm.clients = [companies(:second_client),new_client] 
     987    firm.clients = [companies(:second_client), Client.new("name" => "New Client")] 
    989988    firm.save 
    990989    firm.reload 
    …… 
    15101509 
    15111510  def test_habtm_unique_order_preserved 
    1512     assert_equal [developers(:poor_jamis), developers(:jamis), developers(:david)], projects(:active_record).non_unique_developers 
    1513     assert_equal [developers(:poor_jamis), developers(:jamis), developers(:david)], projects(:active_record).developers 
     1511    assert_equal developers(:poor_jamis, :jamis, :david), projects(:active_record).non_unique_developers 
     1512    assert_equal developers(:poor_jamis, :jamis, :david), projects(:active_record).developers 
    15141513  end 
    15151514 
    …… 
    17921791 
    17931792  def test_get_ids 
    1794     assert_equal [projects(:active_record).id, projects(:action_controller).id], developers(:david).project_ids 
     1793    assert_equal projects(:active_record, :action_controller).map(&:id), developers(:david).project_ids 
    17951794    assert_equal [projects(:active_record).id], developers(:jamis).project_ids 
    17961795  end 
    …… 
    17981797  def test_assign_ids 
    17991798    developer = Developer.new("name" => "Joe") 
    1800     developer.project_ids = [projects(:active_record).id, projects(:action_controller).id] 
     1799    developer.project_ids = projects(:active_record, :action_controller).map(&:id) 
    18011800    developer.save 
    18021801    developer.reload 

  • trunk/activerecord/test/associations/cascaded_eager_loading_test.rb

    r5181 r7081  
    5656  def test_eager_association_loading_with_acts_as_tree 
    5757    roots = TreeMixin.find(:all, :include=>"children", :conditions=>"mixins.parent_id IS NULL", :order=>"mixins.id") 
    58     assert_equal [mixins(:tree_1), mixins(:tree2_1), mixins(:tree3_1)], roots 
     58    assert_equal mixins(:tree_1, :tree2_1, :tree3_1), roots 
    5959    assert_no_queries do 
    6060      assert_equal 2, roots[0].children.size 
    …… 
    7474  def test_eager_association_loading_with_has_many_sti 
    7575    topics = Topic.find(:all, :include => :replies, :order => 'topics.id') 
    76     assert_equal [topics(:first), topics(:second)], topics 
     76    assert_equal topics(:first, :second), topics 
    7777    assert_no_queries do 
    7878      assert_equal 1, topics[0].replies.size 

  • trunk/activerecord/test/associations/eager_test.rb

    r5887 r7081  
    293293   
    294294  def test_limited_eager_with_order 
    295     assert_equal [posts(:thinking), posts(:sti_comments)], Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title)', :limit => 2, :offset => 1) 
    296     assert_equal [posts(:sti_post_and_comments), posts(:sti_comments)], Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title) DESC', :limit => 2, :offset => 1) 
     295    assert_equal posts(:thinking, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title)', :limit => 2, :offset => 1) 
     296    assert_equal posts(:sti_post_and_comments, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title) DESC', :limit => 2, :offset => 1) 
    297297  end 
    298298   
    299299  def test_limited_eager_with_multiple_order_columns 
    300     assert_equal [posts(:thinking), posts(:sti_comments)], Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title), posts.id', :limit => 2, :offset => 1) 
    301     assert_equal [posts(:sti_post_and_comments), posts(:sti_comments)], Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title) DESC, posts.id', :limit => 2, :offset => 1) 
     300    assert_equal posts(:thinking, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title), posts.id', :limit => 2, :offset => 1) 
     301    assert_equal posts(:sti_post_and_comments, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title) DESC, posts.id', :limit => 2, :offset => 1) 
    302302  end 
    303303 

  • trunk/activerecord/test/associations/join_model_test.rb

    r6408 r7081  
    295295  def test_has_many_polymorphic 
    296296    assert_raises ActiveRecord::HasManyThroughAssociationPolymorphicError do 
    297       assert_equal [posts(:welcome), posts(:thinking)], tags(:general).taggables 
     297      assert_equal posts(:welcome, :thinking), tags(:general).taggables 
    298298    end 
    299299    assert_raises ActiveRecord::EagerLoadPolymorphicError do 
    300       assert_equal [posts(:welcome), posts(:thinking)], tags(:general).taggings.find(:all, :include => :taggable) 
     300      assert_equal posts(:welcome, :thinking), tags(:general).taggings.find(:all, :include => :taggable) 
    301301    end 
    302302  end 
    303303   
    304304  def test_has_many_polymorphic_with_source_type 
    305     assert_equal [posts(:welcome), posts(:thinking)], tags(:general).tagged_posts 
     305    assert_equal posts(:welcome, :thinking), tags(:general).tagged_posts 
    306306  end 
    307307 
    308308  def test_eager_has_many_polymorphic_with_source_type 
    309309    tag_with_include = Tag.find(tags(:general).id, :include => :tagged_posts) 
    310     desired = [posts(:welcome), posts(:thinking)] 
     310    desired = posts(:welcome, :thinking) 
    311311    assert_no_queries do 
    312312      assert_equal desired, tag_with_include.tagged_posts 
    …… 
    340340 
    341341  def test_has_many_through_polymorphic_has_many 
    342     assert_equal [taggings(:welcome_general), taggings(:thinking_general)], authors(:david).taggings.uniq.sort_by { |t| t.id } 
     342    assert_equal taggings(:welcome_general, :thinking_general), authors(:david).taggings.uniq.sort_by { |t| t.id } 
    343343  end 
    344344 
    345345  def test_include_has_many_through_polymorphic_has_many 
    346346    author            = Author.find_by_id(authors(:david).id, :include => :taggings) 
    347     expected_taggings = [taggings(:welcome_general), taggings(:thinking_general)] 
     347    expected_taggings = taggings(:welcome_general, :thinking_general) 
    348348    assert_no_queries do 
    349349      assert_equal expected_taggings, author.taggings.uniq.sort_by { |t| t.id } 

  • trunk/activerecord/test/mixin_test.rb

    r5116 r7081  
    2626 
    2727  def test_reordering 
    28     assert_equal [mixins(:list_1), 
    29                   mixins(:list_2), 
    30                   mixins(:list_3), 
    31                   mixins(:list_4)], 
     28    assert_equal mixins(:list_1, :list_2, :list_3, :list_4), 
    3229                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    3330 
    3431    mixins(:list_2).move_lower 
    3532 
    36     assert_equal [mixins(:list_1), 
    37                   mixins(:list_3), 
    38                   mixins(:list_2), 
    39                   mixins(:list_4)], 
     33    assert_equal mixins(:list_1, :list_3, :list_2, :list_4), 
    4034                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    4135 
    4236    mixins(:list_2).move_higher 
    4337 
    44     assert_equal [mixins(:list_1), 
    45                   mixins(:list_2), 
    46                   mixins(:list_3), 
    47                   mixins(:list_4)], 
     38    assert_equal mixins(:list_1, :list_2, :list_3, :list_4), 
    4839                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    4940 
    5041    mixins(:list_1).move_to_bottom 
    5142 
    52     assert_equal [mixins(:list_2), 
    53                   mixins(:list_3), 
    54                   mixins(:list_4), 
    55                   mixins(:list_1)], 
     43    assert_equal mixins(:list_2, :list_3, :list_4, :list_1), 
    5644                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    5745 
    5846    mixins(:list_1).move_to_top 
    5947 
    60     assert_equal [mixins(:list_1), 
    61                   mixins(:list_2), 
    62                   mixins(:list_3), 
    63                   mixins(:list_4)], 
     48    assert_equal mixins(:list_1, :list_2, :list_3, :list_4), 
    6449                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    6550 
    …… 
    6752    mixins(:list_2).move_to_bottom 
    6853 
    69     assert_equal [mixins(:list_1), 
    70                   mixins(:list_3), 
    71                   mixins(:list_4), 
    72                   mixins(:list_2)], 
     54    assert_equal mixins(:list_1, :list_3, :list_4, :list_2), 
    7355                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    7456 
    7557    mixins(:list_4).move_to_top 
    7658 
    77     assert_equal [mixins(:list_4), 
    78                   mixins(:list_1), 
    79                   mixins(:list_3), 
    80                   mixins(:list_2)], 
     59    assert_equal mixins(:list_4, :list_1, :list_3, :list_2), 
    8160                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    8261 
    …… 
    8463 
    8564  def test_move_to_bottom_with_next_to_last_item 
    86     assert_equal [mixins(:list_1), 
    87                   mixins(:list_2), 
    88                   mixins(:list_3), 
    89                   mixins(:list_4)], 
     65    assert_equal mixins(:list_1, :list_2, :list_3, :list_4), 
    9066                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    9167 
    9268    mixins(:list_3).move_to_bottom 
    9369 
    94     assert_equal [mixins(:list_1), 
    95                   mixins(:list_2), 
    96                   mixins(:list_4), 
    97                   mixins(:list_3)], 
     70    assert_equal mixins(:list_1, :list_2, :list_4, :list_3), 
    9871                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    9972  end 
    …… 
    171144 
    172145  def test_delete_middle 
    173     assert_equal [mixins(:list_1), 
    174                   mixins(:list_2), 
    175                   mixins(:list_3), 
    176                   mixins(:list_4)], 
     146    assert_equal mixins(:list_1, :list_2, :list_3, :list_4), 
    177147                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    178148 
    179149    mixins(:list_2).destroy 
    180150 
    181     assert_equal [mixins(:list_1, :reload), 
    182                   mixins(:list_3, :reload), 
    183                   mixins(:list_4, :reload)], 
     151    assert_equal mixins(:list_1, :list_3, :list_4, :reload), 
    184152                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    185153 
    …… 
    190158    mixins(:list_1).destroy 
    191159 
    192     assert_equal [mixins(:list_3, :reload), 
    193                   mixins(:list_4, :reload)], 
     160    assert_equal mixins(:list_3, :list_4, :reload), 
    194161                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos') 
    195162 
    …… 
    227194 
    228195  def test_children 
    229     assert_equal mixins(:tree_1).children, [mixins(:tree_2), mixins(:tree_4)] 
     196    assert_equal mixins(:tree_1).children, mixins(:tree_2, :tree_4) 
    230197    assert_equal mixins(:tree_2).children, [mixins(:tree_3)] 
    231198    assert_equal mixins(:tree_3).children, [] 
    …… 
    273240    assert_equal [], mixins(:tree_1).ancestors 
    274241    assert_equal [mixins(:tree_1)], mixins(:tree_2).ancestors 
    275     assert_equal [mixins(:tree_2), mixins(:tree_1)], mixins(:tree_3).ancestors 
     242    assert_equal mixins(:tree_2, :tree_1), mixins(:tree_3).ancestors 
    276243    assert_equal [mixins(:tree_1)], mixins(:tree_4).ancestors 
    277244    assert_equal [], mixins(:tree2_1).ancestors 
    …… 
    290257 
    291258  def test_roots 
    292     assert_equal [mixins(:tree_1), mixins(:tree2_1), mixins(:tree3_1)], TreeMixin.roots 
     259    assert_equal mixins(:tree_1, :tree2_1, :tree3_1), TreeMixin.roots 
    293260  end 
    294261 
    295262  def test_siblings 
    296     assert_equal [mixins(:tree2_1), mixins(:tree3_1)], mixins(:tree_1).siblings 
     263    assert_equal mixins(:tree2_1, :tree3_1), mixins(:tree_1).siblings 
    297264    assert_equal [mixins(:tree_4)], mixins(:tree_2).siblings 
    298265    assert_equal [], mixins(:tree_3).siblings 
    299266    assert_equal [mixins(:tree_2)], mixins(:tree_4).siblings 
    300     assert_equal [mixins(:tree_1), mixins(:tree3_1)], mixins(:tree2_1).siblings 
    301     assert_equal [mixins(:tree_1), mixins(:tree2_1)], mixins(:tree3_1).siblings 
     267    assert_equal mixins(:tree_1, :tree3_1), mixins(:tree2_1).siblings 
     268    assert_equal mixins(:tree_1, :tree2_1), mixins(:tree3_1).siblings 
    302269  end 
    303270 
    304271  def test_self_and_siblings 
    305     assert_equal [mixins(:tree_1), mixins(:tree2_1), mixins(:tree3_1)], mixins(:tree_1).self_and_siblings 
    306     assert_equal [mixins(:tree_2), mixins(:tree_4)], mixins(:tree_2).self_and_siblings 
     272    assert_equal mixins(:tree_1, :tree2_1, :tree3_1), mixins(:tree_1).self_and_siblings 
     273    assert_equal mixins(:tree_2, :tree_4), mixins(:tree_2).self_and_siblings 
    307274    assert_equal [mixins(:tree_3)], mixins(:tree_3).self_and_siblings 
    308     assert_equal [mixins(:tree_2), mixins(:tree_4)], mixins(:tree_4).self_and_siblings 
    309     assert_equal [mixins(:tree_1), mixins(:tree2_1), mixins(:tree3_1)], mixins(:tree2_1).self_and_siblings 
    310     assert_equal [mixins(:tree_1), mixins(:tree2_1), mixins(:tree3_1)], mixins(:tree3_1).self_and_siblings 
     275    assert_equal mixins(:tree_2, :tree_4), mixins(:tree_4).self_and_siblings 
     276    assert_equal mixins(:tree_1, :tree2_1, :tree3_1), mixins(:tree2_1).self_and_siblings 
     277    assert_equal mixins(:tree_1, :tree2_1, :tree3_1), mixins(:tree3_1).self_and_siblings 
    311278  end 
    312279end 
    …… 
    316283 
    317284  def test_root 
    318     assert [mixins(:tree_without_order_1), mixins(:tree_without_order_2)].include?(TreeMixinWithoutOrder.root) 
     285    assert mixins(:tree_without_order_1, :tree_without_order_2).include?(TreeMixinWithoutOrder.root) 
    319286  end 
    320287 
    321288  def test_roots 
    322     assert_equal [], [mixins(:tree_without_order_1), mixins(:tree_without_order_2)] - TreeMixinWithoutOrder.roots 
     289    assert_equal [], mixins(:tree_without_order_1, :tree_without_order_2) - TreeMixinWithoutOrder.roots 
    323290  end 
    324291end 
    …… 
    395362 
    396363  def test_reordering 
    397     assert_equal [mixins(:list_sub_1), 
    398                   mixins(:list_sub_2), 
    399                   mixins(:list_sub_3), 
    400                   mixins(:list_sub_4)], 
     364    assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_3, :list_sub_4), 
    401365                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    402366 
    403367    mixins(:list_sub_2).move_lower 
    404368 
    405     assert_equal [mixins(:list_sub_1), 
    406                   mixins(:list_sub_3), 
    407                   mixins(:list_sub_2), 
    408                   mixins(:list_sub_4)], 
     369    assert_equal mixins(:list_sub_1, :list_sub_3, :list_sub_2, :list_sub_4), 
    409370                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    410371 
    411372    mixins(:list_sub_2).move_higher 
    412373 
    413     assert_equal [mixins(:list_sub_1), 
    414                   mixins(:list_sub_2), 
    415                   mixins(:list_sub_3), 
    416                   mixins(:list_sub_4)], 
     374    assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_3, :list_sub_4), 
    417375                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    418376 
    419377    mixins(:list_sub_1).move_to_bottom 
    420378 
    421     assert_equal [mixins(:list_sub_2), 
    422                   mixins(:list_sub_3), 
    423                   mixins(:list_sub_4), 
    424                   mixins(:list_sub_1)], 
     379    assert_equal mixins(:list_sub_2, :list_sub_3, :list_sub_4, :list_sub_1), 
    425380                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    426381 
    427382    mixins(:list_sub_1).move_to_top 
    428383 
    429     assert_equal [mixins(:list_sub_1), 
    430                   mixins(:list_sub_2), 
    431                   mixins(:list_sub_3), 
    432                   mixins(:list_sub_4)], 
     384    assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_3, :list_sub_4), 
    433385                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    434386 
    …… 
    436388    mixins(:list_sub_2).move_to_bottom 
    437389 
    438     assert_equal [mixins(:list_sub_1), 
    439                   mixins(:list_sub_3), 
    440                   mixins(:list_sub_4), 
    441                   mixins(:list_sub_2)], 
     390    assert_equal mixins(:list_sub_1, :list_sub_3, :list_sub_4, :list_sub_2), 
    442391                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    443392 
    444393    mixins(:list_sub_4).move_to_top 
    445394 
    446     assert_equal [mixins(:list_sub_4), 
    447                   mixins(:list_sub_1), 
    448                   mixins(:list_sub_3), 
    449                   mixins(:list_sub_2)], 
     395    assert_equal mixins(:list_sub_4, :list_sub_1, :list_sub_3, :list_sub_2), 
    450396                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    451397 
    …… 
    453399 
    454400  def test_move_to_bottom_with_next_to_last_item 
    455     assert_equal [mixins(:list_sub_1), 
    456                   mixins(:list_sub_2), 
    457                   mixins(:list_sub_3), 
    458                   mixins(:list_sub_4)], 
     401    assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_3, :list_sub_4), 
    459402                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    460403 
    461404    mixins(:list_sub_3).move_to_bottom 
    462405 
    463     assert_equal [mixins(:list_sub_1), 
    464                   mixins(:list_sub_2), 
    465                   mixins(:list_sub_4), 
    466                   mixins(:list_sub_3)], 
     406    assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_4, :list_sub_3), 
    467407                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    468408  end 
    …… 
    519459 
    520460  def test_delete_middle 
    521     assert_equal [mixins(:list_sub_1), 
    522                   mixins(:list_sub_2), 
    523                   mixins(:list_sub_3), 
    524                   mixins(:list_sub_4)], 
     461    assert_equal mixins(:list_sub_1, :list_sub_2, :list_sub_3, :list_sub_4), 
    525462                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    526463 
    527464    mixins(:list_sub_2).destroy 
    528465 
    529     assert_equal [mixins(:list_sub_1, :reload), 
    530                   mixins(:list_sub_3, :reload), 
    531                   mixins(:list_sub_4, :reload)], 
     466    assert_equal mixins(:list_sub_1, :list_sub_3, :list_sub_4, :reload), 
    532467                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    533468 
    …… 
    538473    mixins(:list_sub_1).destroy 
    539474 
    540     assert_equal [mixins(:list_sub_3, :reload), 
    541                   mixins(:list_sub_4, :reload)], 
     475    assert_equal mixins(:list_sub_3, :list_sub_4, :reload), 
    542476                  ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos') 
    543477