Make sure orm adapters are loaded (these are loaded in devise, but th…

…ere are issues with the test_helpers conflicting. There may be a better solution here...)

Rakefile

@@ -10,7 +10,6 @@ task :default => [:test, :"neo4j:db:remove"]
 ENV['DEVISE_ORM'] = 'neo4j'
 devise_checked_out = File.join(File.dirname(__FILE__), '../devise')
 ENV['DEVISE_PATH'] =  File.exist?(devise_checked_out) ? devise_checked_out : `bundle show devise`.chomp
-puts ENV['DEVISE_PATH'] 
 desc 'Run tests for devise-neo4j.'
 Rake::TestTask.new(:test) do |test|
   unless File.exist?(ENV['DEVISE_PATH'])
@@ -21,8 +20,12 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
   test.libs << "#{ENV['DEVISE_PATH']}/lib"
   test.libs << "#{ENV['DEVISE_PATH']}/test"
-
-  test.test_files = FileList["#{ENV['DEVISE_PATH']}/test/**/*_test.rb"]  +  FileList['test/**/*_test.rb'] 
+
+  if devise_test_path = ENV['DEVISE_TEST_PATH']
+    test.test_files = FileList["#{ENV['DEVISE_PATH']}/test/#{devise_test_path}"]
+  else
+    test.test_files = FileList["#{ENV['DEVISE_PATH']}/test/**/*_test.rb"]  +  FileList['test/**/*_test.rb'] 
+  end
   test.verbose = true
 end
 
@@ -34,4 +37,4 @@ namespace :neo4j do
       system "rm -fr #{File.join(File.dirname(__FILE__), "db", "*")}"
     end
   end
-end
+end

devise-neo4j.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency("orm_adapter", "~> 0.5.0")
   s.add_dependency("bcrypt-ruby", "~> 3.0")
   s.add_dependency("railties", ">= 3.1")
-  s.add_dependency("neo4j", ">= 2.2.0")
+  s.add_dependency("neo4j", ">= 3.0.0.alpha.6")
   s.add_dependency("devise", "~> 3.0")
 end

test/rails_app/app/neo4j/admin.rb

@@ -38,4 +38,5 @@ class Admin
 
 end
 
+AdminAdapter = Admin.to_adapter unless Admin.is_a?(OrmAdapter::Base)
 

test/rails_app/app/neo4j/user.rb

@@ -43,3 +43,6 @@ class User
   property :updated_at, type: DateTime
 
 end
+
+UserAdapter  = User.to_adapter unless User.is_a?(OrmAdapter::Base)
+