test/fixtures/friendships.yml test/rails_root/app/models/friendship.rb test/rails_root/db/migrate/010_create_friendships.rb test/unit/friendship_test.rb @@ -20,7 +20,7 @@ module ThoughtBot # :nodoc: # For all of these helpers, the last parameter may be a hash of options. # module ActiveRecord - # Ensures that the model cannot be saved if one of the attributes listed is not present. + # Ensures that the model cannot be saved if one of the attributes listed is not present. # # If an instance variable has been created in the setup named after the # model being tested, then this method will use that. Otherwise, it will @@ -395,11 +395,6 @@ module ThoughtBot # :nodoc: assert reflection, "#{klass.name} does not have any relationship to #{association}" assert_equal :has_many, reflection.macro - associated_klass_name = reflection.options[:class_name] - associated_klass_name = reflection.options[:source].to_s.classify if associated_klass_name.blank? - associated_klass_name = association.to_s.classify if associated_klass_name.blank? - associated_klass = associated_klass_name.constantize - if through through_reflection = klass.reflect_on_association(through) assert through_reflection, "#{klass.name} does not have any relationship to #{through}" @@ -409,7 +404,7 @@ module ThoughtBot # :nodoc: if dependent assert_equal dependent.to_s, reflection.options[:dependent].to_s, - "#{associated_klass.name} should have #{dependent} dependency" + "#{association} should have #{dependent} dependency" end # Check for the existence of the foreign key on the other table @@ -422,6 +417,9 @@ module ThoughtBot # :nodoc: fk = reflection.primary_key_name end + associated_klass_name = (reflection.options[:class_name] || association.to_s.classify) + associated_klass = associated_klass_name.constantize + assert associated_klass.column_names.include?(fk.to_s), "#{associated_klass.name} does not have a #{fk} foreign key." end lib/shoulda/active_record_helpers.rb @@ -2,16 +2,19 @@ class User < ActiveRecord::Base has_many :posts has_many :dogs, :foreign_key => :owner_id + has_many :friendships + has_many :friends, :through => :friendships + has_one :address, :as => :addressable named_scope :old, :conditions => "age > 50" named_scope :eighteen, :conditions => { :age => 18 } named_scope :recent, lambda {|count| { :limit => count } } - + def self.recent_via_method(count) scoped(:limit => count) end - + attr_protected :password attr_readonly :name test/rails_root/app/models/user.rb @@ -6,6 +6,9 @@ class UserTest < Test::Unit::TestCase should_have_many :posts should_have_many :dogs + should_have_many :friendships + should_have_many :friends + should_have_one :address should_have_indices :email, :name, [:email, :name] @@ -13,7 +16,7 @@ class UserTest < Test::Unit::TestCase should_have_named_scope :old, :conditions => "age > 50" should_have_named_scope :eighteen, :conditions => { :age => 18 } - + should_have_named_scope 'recent(5)', :limit => 5 should_have_named_scope 'recent(1)', :limit => 1 should_have_named_scope 'recent_via_method(7)', :limit => 7 @@ -32,11 +35,11 @@ class UserTest < Test::Unit::TestCase should_have_instance_methods :email, :age, :email=, :valid? should_have_db_columns :name, :email, :age should_have_db_column :id, :type => "integer", :primary => true - should_have_db_column :email, :type => "string", :default => nil, :precision => nil, :limit => 255, + should_have_db_column :email, :type => "string", :default => nil, :precision => nil, :limit => 255, :null => true, :primary => false, :scale => nil, :sql_type => 'varchar(255)' should_require_acceptance_of :eula should_require_unique_attributes :email, :scoped_to => :name - + should_ensure_length_is :ssn, 9, :message => "Social Security Number is not the right length" should_only_allow_numeric_values_for :ssn test/unit/user_test.rb 5411ccf9765ac517fb5079818e84304be2d96b94 Ryan McGeary ryanongit@mcgeary.org http://github.com/thoughtbot/shoulda/commit/68e42610bed1a1caf0a2bb5fe73f72ccd5e44e89 68e42610bed1a1caf0a2bb5fe73f72ccd5e44e89 2008-08-31T09:14:16-07:00 2008-08-31T09:14:16-07:00 Fixed should_have_many regression [#60] * Removed the check for the :source option on the assocation as it did not always yield the correct class name * Added tests to prevent the regression again d4f6a49d7569af4b0763a1ea1a46129fe6398f1c Ryan McGeary ryanongit@mcgeary.org