0
@@ -1,8 +1,13 @@
0
 Autotest.add_hook :initialize do |at|
0
+  at.add_mapping(%r{^lib/\w.*\.rb}) do
0
+    at.files_matching(%r{^test/*/\w.*_test\.rb})
0
+  end
0
+
0
   at.add_mapping(%r{^test/rails_root/\w.*}) do
0
     at.files_matching(%r{^test/*/\w.*_test\.rb})
0
   end
0
 
0
   at.add_exception(%r{.svn})
0
   at.add_exception(%r{.log$})
0
+  at.add_exception(%r{^.autotest$})
0
 end

0
@@ -302,7 +302,7 @@ module ThoughtBot # :nodoc:
0
               elsif reflection.options[:as]
0
                 fk = reflection.options[:as].to_s.foreign_key
0
               else
0
-                fk = klass.name.foreign_key
0
+                fk = reflection.primary_key_name
0
               end
0
               associated_klass = (reflection.options[:class_name] || association.to_s.classify).constantize
0
               assert associated_klass.column_names.include?(fk.to_s), "#{associated_klass.name} does not have a #{fk} foreign key."
0
@@ -367,7 +367,7 @@ module ThoughtBot # :nodoc:
0
 
0
             unless reflection.options[:polymorphic]
0
               associated_klass = (reflection.options[:class_name] || association.to_s.classify).constantize
0
-              fk = reflection.options[:foreign_key] || associated_klass.name.foreign_key
0
+              fk = reflection.options[:foreign_key] || reflection.primary_key_name
0
               assert klass.column_names.include?(fk.to_s), "#{klass.name} does not have a #{fk} foreign key."
0
             end
0
           end