test/helper.rb in methodmissing-mysqlplus_adapter-1.0.1 vs test/helper.rb in methodmissing-mysqlplus_adapter-1.0.2

@@ -1,13 +1,22 @@
 require 'rubygems'
+require 'mocha'
 require 'active_support'
+require 'active_support/test_case'
 require 'activerecord'
+
 ActiveRecord.load_all!
 
 module Mysqlplus
   class Test
     
+    CONNECTION_SPEC = { :adapter  => 'mysqlplus',
+                        :username => 'root',
+                        :database => 'mysql',
+                        :pool => 5,
+                        :warmup => true }
+    
     MODELS_DIR = "#{File.dirname(__FILE__)}/models".freeze
     
     class << self
       
       def prepare!
@@ -30,20 +39,16 @@
           files << glob( "#{AR_TEST_SUITE}/cases/**/*_test{,_mysqlplus}.rb" )
         end.sort
       end
 
       def test_files
-        glob( "#{File.dirname(__FILE__)}/*_test.rb" )
+        glob( "#{File.dirname(__FILE__)}/**/*_test.rb" )
       end
 
       private
 
       def connect!
-        ::ActiveRecord::Base.establish_connection( :adapter  => 'mysqlplus',
-                                                   :username => 'root',
-                                                   :database => 'mysql',
-                                                   :pool => 5,
-                                                   :warmup => true )
+        ::ActiveRecord::Base.establish_connection( CONNECTION_SPEC )
       end
 
       def require_models
         Dir.entries( MODELS_DIR ).grep(/.rb/).each do |model|
           require_model( model )
\ No newline at end of file