spec/spec_helper.rb in relevance-castronaut-0.5.0 vs spec/spec_helper.rb in relevance-castronaut-0.5.1

@@ -8,14 +8,11 @@
 require File.join(File.dirname(__FILE__), 'spec_rails_mocks')
 
 Castronaut.config = Castronaut::Configuration.load(File.join(File.dirname(__FILE__), '..', 'config', 'castronaut.example.yml'))
 
 class CreateUsers < ActiveRecord::Migration
-  old_connection = ActiveRecord::Base.connection
-  ActiveRecord::Base.connection = Castronaut::Adapters::RestfulAuthentication::User.connection
-
-  create_table "users", :force => true do |t|
+  Castronaut::Adapters::RestfulAuthentication::User.connection.create_table "users", :force => true do |t|
     t.column :login,                     :string, :limit => 40
     t.column :name,                      :string, :limit => 100, :default => '', :null => true
     t.column :email,                     :string, :limit => 100
     t.column :crypted_password,          :string, :limit => 40
     t.column :salt,                      :string, :limit => 40
@@ -23,26 +20,19 @@
     t.column :updated_at,                :datetime
     t.column :remember_token,            :string, :limit => 40
     t.column :remember_token_expires_at, :datetime
     t.string :first_name, :last_name
   end
-  add_index :users, :login, :unique => true
-
-  ActiveRecord::Base.connection = old_connection
+  Castronaut::Adapters::RestfulAuthentication::User.connection.add_index :users, :login, :unique => true
 end
 
 class CreateUsers < ActiveRecord::Migration
-  old_connection = ActiveRecord::Base.connection
-  ActiveRecord::Base.connection = Castronaut::Adapters::Development::User.connection
-
-  create_table "users", :force => true do |t|
+  Castronaut::Adapters::Development::User.connection.create_table "users", :force => true do |t|
     t.column :login,                     :string, :limit => 40
     t.column :name,                      :string, :limit => 100, :default => '', :null => true
     t.column :password,                  :string
   end
-  add_index :users, :login, :unique => true
-
-  ActiveRecord::Base.connection = old_connection
+  Castronaut::Adapters::Development::User.connection.add_index :users, :login, :unique => true
 end
 
 Spec::Runner.configure do |config|
   config.include Spec::Rails::Mocks
 end