<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -37,15 +37,15 @@ class HasManyAssociationsTest &lt; ActiveRecord::TestCase
   end
 
   def test_counting_with_single_conditions
-    assert_equal 2, Firm.find(:first).plain_clients.count(:conditions =&gt; '1=1')
+    assert_equal 1, Firm.find(:first).plain_clients.count(:conditions =&gt; 'name=&quot;Microsoft&quot;')
   end
 
   def test_counting_with_single_hash
-    assert_equal 2, Firm.find(:first).plain_clients.count(:conditions =&gt; '1=1')
+    assert_equal 1, Firm.find(:first).plain_clients.count(:conditions =&gt; {:name =&gt; &quot;Microsoft&quot;})
   end
 
   def test_counting_with_column_name_and_hash
-    assert_equal 2, Firm.find(:first).plain_clients.count(:all, :conditions =&gt; '1=1')
+    assert_equal 2, Firm.find(:first).plain_clients.count(:name)
   end
 
   def test_finding</diff>
      <filename>activerecord/test/cases/associations/has_many_associations_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>ca9641f8a7ca1142d0ea99405a079c8699bd443c</id>
    </parent>
  </parents>
  <author>
    <name>Jan De Poorter</name>
    <login>DefV</login>
    <email>jan@defv.be</email>
  </author>
  <url>http://github.com/rails/rails/commit/d0b3685a0e221b54fdf3c27326564950a419d823</url>
  <id>d0b3685a0e221b54fdf3c27326564950a419d823</id>
  <committed-date>2008-06-11T05:18:54-07:00</committed-date>
  <authored-date>2008-06-03T02:06:59-07:00</authored-date>
  <message>Added some has_many tests

Signed-off-by: Pratik Naik &lt;pratiknaik@gmail.com&gt;</message>
  <tree>1fadcad6671d517747bdd003cd5abb5b4bfadd21</tree>
  <committer>
    <name>Pratik Naik</name>
    <login>lifo</login>
    <email>pratiknaik@gmail.com</email>
  </committer>
</commit>
