test/shoulda_macro_test.rb @@ -10,20 +10,20 @@ module HasDigest def should_have_digest(name, options = {}) options.assert_valid_keys(:depends, :limit) - context "#{model_class.name} with has_digest :#{name}" do + context "#{described_type.name} with has_digest :#{name}" do should_have_db_column name, :type => :string, :limit => (options[:limit] || 40) should "generate digest for :#{name}" do - assert_not_nil self.class.model_class.has_digest_attributes[name] + assert_not_nil self.class.described_type.has_digest_attributes[name] end if options[:depends] dependencies = options[:depends] dependencies = [dependencies] unless dependencies.respond_to?(:each) - dependencies.unshift(:salt) if model_class.column_names.include?('salt') + dependencies.unshift(:salt) if described_type.column_names.include?('salt') should "generate digest for :#{name} from #{dependencies.to_sentence}" do - attributes = self.class.model_class.has_digest_attributes[name] || {} + attributes = self.class.described_type.has_digest_attributes[name] || {} assert_equal dependencies, attributes[:dependencies] end end shoulda_macros/has_digest.rb @@ -1,16 +1,18 @@ require 'rubygems' require 'test/unit' +require 'active_record' require 'shoulda' +require 'shoulda/active_record' require 'mocha' -require 'active_record' require File.join(File.dirname(__FILE__), '..', 'lib', 'has_digest.rb') +require File.join(File.dirname(__FILE__), '..', 'shoulda_macros', 'has_digest.rb') ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:') def model_with_attributes(*attributes, &block) ActiveRecord::Base.connection.create_table :models, :force => true do |table| attributes.each do |attribute| - table.string attribute + table.string attribute, :limit => 40 end end test/test_helper.rb bc53309ff0ae36cdf30e1b171ebb04fb985c194b Matthew Todd matthew.todd@gmail.com http://github.com/matthewtodd/has_digest/commit/700d10bd77d232c91aa45988a27eded97f95474a 700d10bd77d232c91aa45988a27eded97f95474a 2009-09-02T00:54:29-07:00 2009-09-02T00:41:24-07:00 Fixed should_have_digest to work with latest shoulda. 81870c7aad91605e33156583dc404f9d17f837c7 Matthew Todd matthew.todd@gmail.com