test/rails_app/app/data_mapper/user.rb in dm-devise-1.1.4 vs test/rails_app/app/data_mapper/user.rb in dm-devise-1.1.5

- old
+ new

@@ -1,15 +1,16 @@ -require 'shared_user' - class User include DataMapper::Resource property :id, Serial property :username, String property :facebook_token, String timestamps :at - include SharedUser + devise :database_authenticatable, :confirmable, :lockable, :recoverable, + :registerable, :rememberable, :timeoutable, :token_authenticatable, + :trackable, :validatable + include Shim before :valid?, :update_password_confirmation # DM's validates_confirmation_of requires the confirmation field to be present,