0
@@ -2,7 +2,7 @@ require 'rake'
0
 require 'rake/testtask'
0
 require 'rake/rdoctask'
0
 
0
-require 'lib/tasks/list_tests.rb'
0
+#require 'tasks/list_tests.rake'
0
 
0
 # Test::Unit::UI::VERBOSE
0
 

0
@@ -317,14 +317,14 @@ module ThoughtBot # :nodoc:
0
       #
0
       #   should_belong_to :parent
0
       def should_belong_to(*associations)
0
-        get_options!(associations)
0
+        fk = get_options!(associations, :foreign_key)
0
         klass = model_class
0
         associations.each do |association|
0
           should "belong_to #{association}" do
0
             reflection = klass.reflect_on_association(association)
0
             assert reflection, "#{klass.name} does not have any relationship to #{association}"
0
             assert_equal :belongs_to, reflection.macro
0
-            fk = reflection.options[:foreign_key] || "#{association}_id"
0
+            fk ||= (reflection.options[:foreign_key] || "#{association}_id")
0
             assert klass.column_names.include?(fk), "#{klass.name} does not have a #{fk} foreign key."
0
           end
0
         end

0
@@ -1,7 +1,7 @@
0
 class CreateTaggings < ActiveRecord::Migration
0
   def self.up
0
     create_table :taggings do |t|
0
-      t.column :user_id, :integer
0
+      t.column :post_id, :integer
0
       t.column :tag_id, :integer
0
     end
0
   end

0
@@ -3,6 +3,6 @@ require File.dirname(__FILE__) + '/../test_helper'
0
 class TaggingTest < Test::Unit::TestCase
0
   load_all_fixtures
0
 
0
-  should_belong_to :post
0
+  should_belong_to :post, :foreign_key
0
   should_belong_to :tag
0
 end