From 4e2cd157c168a8630ecde2cf730ebb909aee3c40 Mon Sep 17 00:00:00 2001
From: snusnu <gamsnjaga@gmail.com>
Date: Fri, 18 Jun 2010 01:51:49 +0200
Subject: [PATCH] Specs surely don't pass, but they run at least!

---
 lib/devise/orm/data_mapper.rb          | 10 ++++------
 test/orm/data_mapper.rb                |  9 +++++++++
 test/rails_app/app/data_mapper/shim.rb |  2 ++
 test/rails_app/app/data_mapper/user.rb |  5 ++++-
 4 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 test/rails_app/app/data_mapper/shim.rb

diff --git a/lib/devise/orm/data_mapper.rb b/lib/devise/orm/data_mapper.rb
index ae157976..aa3a27a7 100644
--- a/lib/devise/orm/data_mapper.rb
+++ b/lib/devise/orm/data_mapper.rb
@@ -72,7 +72,7 @@ module Devise
             end
           end
         end
-        
+
         def changed?
           dirty?
         end
@@ -84,7 +84,7 @@ module Devise
             super()
           end
         end
-        
+
         def update_attributes(*args)
           update(*args)
         end
@@ -93,7 +93,5 @@ module Devise
   end
 end
 
-DataMapper::Model.class_eval do
-  include Devise::Models
-  include Devise::Orm::DataMapper::Hook
-end
+DataMapper::Model.append_extensions(Devise::Models)
+DataMapper::Model.append_extensions(Devise::Orm::DataMapper::Hook)
diff --git a/test/orm/data_mapper.rb b/test/orm/data_mapper.rb
index 8fc5ca87..2f042a5d 100644
--- a/test/orm/data_mapper.rb
+++ b/test/orm/data_mapper.rb
@@ -1 +1,10 @@
+require 'rails/test_help'
+
 DataMapper.auto_migrate!
+
+class ActiveSupport::TestCase
+  setup do
+    User.all.destroy!
+    Admin.all.destroy!
+  end
+end
diff --git a/test/rails_app/app/data_mapper/shim.rb b/test/rails_app/app/data_mapper/shim.rb
new file mode 100644
index 00000000..66f12cdb
--- /dev/null
+++ b/test/rails_app/app/data_mapper/shim.rb
@@ -0,0 +1,2 @@
+module Shim
+end
diff --git a/test/rails_app/app/data_mapper/user.rb b/test/rails_app/app/data_mapper/user.rb
index 59cc3e91..5c3859bf 100644
--- a/test/rails_app/app/data_mapper/user.rb
+++ b/test/rails_app/app/data_mapper/user.rb
@@ -1,6 +1,9 @@
 class User
   include DataMapper::Resource
-  
+
+  extend  Devise::Orm::DataMapper::Schema
+  include Devise::Orm::DataMapper::Compatibility
+
   property :id, Serial
   property :username, String