make specs play well together

This commit is contained in:
Josh Lane 2014-06-25 13:11:20 -07:00
parent 0a66461050
commit 0154277dc4
8 changed files with 23 additions and 16 deletions

View File

@ -16,24 +16,24 @@ module DataMapper
end
before(:each) do
connection.truncate_tables ['users']
connection.truncate_tables(DataMapper::Model.descendants.map { |d| d.storage_names[:default] || d.name.underscore })
end
describe "#truncate_table" do
it "truncates the table" do
2.times { User.create }
2.times { DmUser.create }
connection.truncate_table('users')
User.count.should eq 0
connection.truncate_table(DmUser.storage_names[:default])
DmUser.count.should eq 0
end
it "resets AUTO_INCREMENT index of table" do
2.times { User.create }
User.destroy
2.times { DmUser.create }
DmUser.destroy
connection.truncate_table('users')
connection.truncate_table(DmUser.storage_names[:default])
User.create.id.should eq 1
DmUser.create.id.should eq 1
end
end

View File

@ -3,6 +3,7 @@ require 'support/active_record/schema_setup'
module MySQL2Helper
puts "Active Record #{ActiveRecord::VERSION::STRING}, mysql2"
# require 'logger'
@ -26,7 +27,7 @@ module MySQL2Helper
def active_record_mysql2_setup
create_db
establish_connection
load_schema
active_record_load_schema
end
def active_record_mysql2_connection

View File

@ -2,6 +2,7 @@ require 'support/active_record/database_setup'
require 'support/active_record/schema_setup'
module MySQLHelper
puts "Active Record #{ActiveRecord::VERSION::STRING}, mysql"
# require 'logger'
@ -25,7 +26,7 @@ module MySQLHelper
def active_record_mysql_setup
create_db
establish_connection
load_schema
active_record_load_schema
end
def active_record_mysql_connection

View File

@ -2,6 +2,7 @@ require 'support/active_record/database_setup'
require 'support/active_record/schema_setup'
module PostgreSQLHelper
puts "Active Record #{ActiveRecord::VERSION::STRING}, pg"
# ActiveRecord::Base.logger = Logger.new(STDERR)
@ -28,7 +29,7 @@ module PostgreSQLHelper
def active_record_pg_setup
create_db
establish_connection
load_schema
active_record_load_schema
end
def active_record_pg_connection

View File

@ -1,4 +1,4 @@
def load_schema
def active_record_load_schema
ActiveRecord::Schema.define do
create_table :users, :force => true do |t|
t.integer :name

View File

@ -2,6 +2,7 @@ require 'support/active_record/database_setup'
require 'support/active_record/schema_setup'
module SQLite3Helper
puts "Active Record #{ActiveRecord::VERSION::STRING}, sqlite3"
# ActiveRecord::Base.logger = Logger.new(STDERR)
@ -27,7 +28,7 @@ module SQLite3Helper
def active_record_sqlite3_setup
create_db
establish_connection
load_schema
active_record_load_schema
end
def active_record_sqlite3_connection

View File

@ -1,12 +1,14 @@
def load_schema
def data_mapper_load_schema
require 'dm-migrations'
DataMapper.auto_migrate!
end
class ::User
class ::DmUser
include DataMapper::Resource
self.storage_names[:default] = 'users'
property :id, Serial
property :name, String

View File

@ -2,6 +2,7 @@ require 'support/active_record/database_setup'
require 'support/data_mapper/schema_setup'
module DataMapperSQLite3Helper
puts "DataMapper #{DataMapper::VERSION}, sqlite3"
def config
@ -25,7 +26,7 @@ module DataMapperSQLite3Helper
def data_mapper_sqlite3_setup
create_db
establish_connection
load_schema
data_mapper_load_schema
end
def data_mapper_sqlite3_connection